Michael Niedermayer
0491695358
avdevice/fbdev_enc: avoid declaring variables in for()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-24 10:19:38 +02:00
Paul B Mahol
426abbb632
avfilter/libmpcodecs/vf_eq: remove useless storage class specifier in empty declaration
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-24 07:44:23 +00:00
Lukasz Marek
a547c496e9
lavd/fbdev: move common code to separate file
...
Move common fbdev dec/enc for separate file.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-10-24 08:45:59 +02:00
Lukasz Marek
c720d0d9df
lavd: rename fbdev.c into fbdev_dec.c
...
Rename existing fbdev.c to make it a more meaningful name.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-10-24 08:38:33 +02:00
Lukasz Marek
759388aa71
lavd: add fbdev output device
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-10-24 08:16:17 +02:00
Stefano Sabatini
ff9d11f95d
lsws: use av_pix_fmt_get_chroma_sub_sample()
...
Remove duplicated getSubSampleFactors() function. Simplify.
2013-10-24 08:12:38 +02:00
Vittorio Giovara
fb13fe8342
golomb: reduce scope of a few variables
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-10-24 02:04:34 +02:00
Michael Niedermayer
2f31b73a11
avcodec/mpegaudio_tablegen: fix build with hardcoded tables
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-24 01:18:37 +02:00
Michael Niedermayer
fbdc98c758
avcodec/metasound_data: Fix inconsistency in tables
...
Fixes out of array read
This issue can be reproduced with:
Lucky.asf
teuflisch.asf
from http://samples.ffmpeg.org/A-codecs/VoxWare/
as well as other samples
fcb16m has 320 elements but the code before the patch can address a
table of 384 elements in its place.
I dont know if theres some elements missing, or its maybe the wrong
table, or if the parameters affecting the table size are wrong, or
if theres something else wrong.
if someone reading this has easy access to some reference. (binary
with the tables in it, spec, whatever, please contact us)
This solution fixes the inconsistency by padding the table with zeros,
this variant was suggested by Vitor Sessak. And ensures that nothing
currently working breaks.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 22:04:29 +02:00
Michael Niedermayer
92f649b411
avcodec/hevc: remove CODEC_CAP_EXPERIMENTAL
...
Approved-by: mraulet
Approved-by: smarter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 20:00:11 +02:00
Michael Niedermayer
02a31f6a74
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
golomb: K&R formatting cosmetics
Conflicts:
libavcodec/golomb.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 19:45:07 +02:00
Michael Niedermayer
4c18c31438
Merge commit '1ce3ec24b35d9d549b12f17bd7fd391abaf3a6f7'
...
* commit '1ce3ec24b35d9d549b12f17bd7fd391abaf3a6f7':
h263: K&R formatting cosmetics
Conflicts:
libavcodec/h263dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 19:37:09 +02:00
Paul B Mahol
3a75c4e93b
fate: fix fieldorder test
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-23 17:35:37 +00:00
Michael Niedermayer
23dec54c5d
Merge commit '0d6d4a9e4a626be6ff55839eab4114aeac45ba88'
...
* commit '0d6d4a9e4a626be6ff55839eab4114aeac45ba88':
avstring-test: Mark pointer passed to av_free() as non-const
See: ab796ded75
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 18:53:32 +02:00
Michael Niedermayer
05eb0f125c
avutil/log: document log callback thread saftey requirements
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 18:15:49 +02:00
Michael Niedermayer
423ae31354
avutil/log: make default av_log callback thread safe
...
This uses a pthread mutex
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 18:15:49 +02:00
Michael Niedermayer
094c40ca37
avcodec/utils: use a default lock manager that uses a pthread mutex
...
That makes avformat & avcodec thread safe without the need to explicitly
register a lock manager.
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 16:38:06 +02:00
Michael Niedermayer
3ce7c62e1b
avformat/framehash: add software version to framecrc/md5
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 16:32:32 +02:00
James Almer
c994b42830
lavf/adtsenc: Add support for APE tags
...
Should fix ticket #2269
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 16:13:23 +02:00
Robert Krüger
83922cccb2
avfilter/vf_scale: Correct vf_scale mappings from arguments to color range
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 15:44:31 +02:00
Daniel Kang
0e73049416
avfilter: x86: Port gradfun filter optimizations to yasm
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-10-23 14:50:27 +02:00
Michael Niedermayer
1e2ab98460
avcodec/vc1dec: use logical operation instead of bitwise for twomv
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 14:32:04 +02:00
Michael Niedermayer
867e7bb4f1
fix order of operations in comments
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 14:32:04 +02:00
Vittorio Giovara
2c993e8b5e
golomb: K&R formatting cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-10-23 13:17:23 +02:00
Luca Barbato
1ce3ec24b3
h263: K&R formatting cosmetics
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-10-23 13:17:23 +02:00
Diego Biurrun
0d6d4a9e4a
avstring-test: Mark pointer passed to av_free() as non-const
...
libavutil/avstring.c:278:9: warning: passing argument 1 of ‘av_free’ discards ‘const’ qualifier from pointer target type
2013-10-23 13:17:23 +02:00
Michael Niedermayer
3d3a7f5034
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
mpegvideo: Drop a faulty assert
Conflicts:
libavcodec/mpegvideo.c
Merge for metadata only, the change looks wrong.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 13:04:30 +02:00
Michael Niedermayer
f4f8499c19
Merge commit 'f6633c55a3c0e93a5b2bab6aa0692fb608f2a38d'
...
* commit 'f6633c55a3c0e93a5b2bab6aa0692fb608f2a38d':
avfilter: Fix typo in Loren's email address
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 12:14:49 +02:00
Michael Niedermayer
76424b2da8
Merge commit 'e01fba5562133ac56a4f44c6f214a80ee33cb388'
...
* commit 'e01fba5562133ac56a4f44c6f214a80ee33cb388':
movenc: Add an F4V muxer
Conflicts:
Changelog
libavformat/allformats.c
libavformat/movenc.c
libavformat/version.h
See: 7bc70930dd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 12:05:48 +02:00
Michael Niedermayer
b36257921e
ffmpeg: Dont crash on unconnected output pads before an error is printed
...
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 11:39:43 +02:00
Michael Niedermayer
435a730e21
avcodec/aacdec: fix more avpriv_report_missing_feature() arguments
...
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 10:57:16 +02:00
Luca Barbato
72072bf9de
mpegvideo: Drop a faulty assert
...
That check is easily reachable by faulty input.
CC:libav-stable@libav.org
Reported-by: Torsten Sadowski <tsadowski@gmx.net>
2013-10-23 10:49:48 +02:00
Michael Niedermayer
72cf47b241
avcodec/aacdec: fix avpriv_report_missing_feature() arguments
...
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 10:45:50 +02:00
Diego Biurrun
f6633c55a3
avfilter: Fix typo in Loren's email address
2013-10-23 10:25:14 +02:00
Clément Bœsch
e01fba5562
movenc: Add an F4V muxer
...
F4V is Adobe's mp4/iso media variant, with the most significant
addition/change being supporting other flash codecs than just
aac/h264.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-10-23 11:17:03 +03:00
Michael Niedermayer
eb4205cc89
swscale/utils: check mprotect() return code
...
Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 10:14:05 +02:00
Michael Niedermayer
fdb4822559
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
aac: Add support for Enhanced AAC Low Delay (ER AAC ELD).
Conflicts:
Changelog
libavcodec/aacdec.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 10:02:43 +02:00
Michael Niedermayer
e0f2918223
Merge commit 'f457edb69794c7e13b3630456d72f7942fff19f7'
...
* commit 'f457edb69794c7e13b3630456d72f7942fff19f7':
aacdec: Use avpriv_report_missing_feature() instead of custom logging.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 09:53:57 +02:00
Michael Niedermayer
078abccdd6
Merge commit 'b1fcdc08ceb5df69fac34aa0d57c56905d32b8b4'
...
* commit 'b1fcdc08ceb5df69fac34aa0d57c56905d32b8b4':
nut: Fix unchecked allocations
Conflicts:
libavformat/nut.c
libavformat/nutdec.c
libavformat/nutenc.c
See: 55ae13e3de
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 09:48:20 +02:00
Michael Niedermayer
d0f0ac426b
Merge commit '3511d4fc9784d5fbb024dce68ca7a0d7fdd74663'
...
* commit '3511d4fc9784d5fbb024dce68ca7a0d7fdd74663':
pthread: Avoid crashes/odd behavior caused by spurious wakeups
See: 692b930904
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 09:28:24 +02:00
Alex Converse
b3be41ca82
aac: Add support for Enhanced AAC Low Delay (ER AAC ELD).
...
This does not include support for LD SBR, epTool, data resilience, nor
the 960 transform family.
2013-10-23 00:08:29 -07:00
Alex Converse
f457edb697
aacdec: Use avpriv_report_missing_feature() instead of custom logging.
2013-10-23 00:08:29 -07:00
Michael Niedermayer
60ea0a5236
avcodec/sgi: Fix dereferencing uninitialized pointer
...
This also fixes the code so it decodes raw images correctly again
No release is affected by this
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 02:49:45 +02:00
Michael Niedermayer
610a8b1537
avcodec/hevc/extract_rbsp: fix error return type
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-22 20:31:49 +02:00
Mickaël Raulet
0c8aba3842
hevc: add wavefront parallel processing
...
cherry picked from commit b971f2c8fdc60f8bab605a6e8060492eb548a53a
cherry picked from commit e57b0a2c915ce6b8a9d57b8292f6581f0680842e
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-22 20:20:40 +02:00
Mickaël Raulet
e146c326b9
avcodec/pthread: add wpp api
...
cherry picked from commit c7765f3295fe7dc0653161c6a3d3e1778b76ee67
cherry picked from commit 0008c4979fc1d1bc24d4d2c791715f6dd017563c
Conflicts:
libavcodec/utils.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-22 19:55:47 +02:00
Michael Niedermayer
519395e4dd
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
fate: add fieldorder filter test
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-22 19:43:32 +02:00
Michael Niedermayer
f94124c23e
Merge commit '00d7369de06a16f7c8770a899fcb16bcb94b1e20'
...
* commit '00d7369de06a16f7c8770a899fcb16bcb94b1e20':
vf_fieldorder: log when processing is skipped
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-22 19:26:42 +02:00
Michael Niedermayer
4aeafbaab8
Merge commit '103d073dd7ce23b912df32be8c9524ba25dd5991'
...
* commit '103d073dd7ce23b912df32be8c9524ba25dd5991':
h264_parser: Use ff_h264_reset_sei()
Conflicts:
libavcodec/h264_parser.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-22 19:19:28 +02:00
Michael Niedermayer
3e1483d03e
Merge commit '19f53840001a7afcdb57b2a797e363ec8081aba3'
...
* commit '19f53840001a7afcdb57b2a797e363ec8081aba3':
h264_parser: Fix order of operations
See: 9c0fe487c7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-22 19:15:19 +02:00