aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* avcodec/jpeg2000dec: get_qcx, fix stack and heap overwritesMichael Niedermayer2013-05-221-2/+2
| | | | | | | | | This is likely remotely exploitable Fix ported from j2kdec No uptodate FFmpeg release should be affected by this Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavu/opt: check if class is NULL tooPaul B Mahol2013-05-211-1/+1
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* lavfi/(a)showinfo: use link frame counter instead of local counter.Clément Bœsch2013-05-212-18/+4
|
* avutil/pixfmt: add forgotten deprecated to YUVJ411Michael Niedermayer2013-05-211-1/+1
| | | | | Found-by: wm4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* jpeg2000dec: Check ncomponents and tile dimensionsMichael Niedermayer2013-05-211-0/+7
| | | | | | | | | Fixes various problems Code ported from j2kdec Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/j2k: rename J2K_ constants to JPEG2000_Michael Niedermayer2013-05-214-133/+133
| | | | | | This should simplify merging the 2 decoders Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* j2k: Rename structs to be more similar to jpeg2000decMichael Niedermayer2013-05-214-205/+205
| | | | | | This should simplify merging Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* j2kdec: s/decode_packets/jpeg2000_decode_packets/Michael Niedermayer2013-05-211-2/+2
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavfi/geq: prefer symbolic constantsStefano Sabatini2013-05-211-32/+34
| | | | Hopefully enhance readability.
* lavfi/geq: add aliases for RGB optionsStefano Sabatini2013-05-213-13/+20
|
* vp3: zero allocated tablesPaul B Mahol2013-05-211-8/+8
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* seek-test: make duration user configurableMichael Niedermayer2013-05-211-1/+4
| | | | | | Previously this was hardcoded to 4 seconds Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavfi/yadif: add timeline support.Clément Bœsch2013-05-212-2/+3
|
* avcodec/huffman: increase bits constantMichael Niedermayer2013-05-211-1/+1
| | | | | | Fixes Ticket2593 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/huffman: use named identifer for the bits constantMichael Niedermayer2013-05-214-4/+5
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/bitstream: print vlc length in error case.Michael Niedermayer2013-05-211-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mjpegdec: fix AV_PIX_FMT_YUVJ411P handlingMichael Niedermayer2013-05-211-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* add YUVJ411PMichael Niedermayer2013-05-2114-0/+28
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-05-211-26/+28
|\ | | | | | | | | | | | | * qatar/master: proresdec: simplify slice component offsets handling Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * proresdec: simplify slice component offsets handlingKostya Shishkov2013-05-211-26/+28
| |
* | Merge commit 'cfbd98abe82cfcb9984a18d08697251b72b110c8'Michael Niedermayer2013-05-211-2/+3
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'cfbd98abe82cfcb9984a18d08697251b72b110c8': mjpegdec: validate parameters in mjpeg_decode_scan_progressive_ac Conflicts: libavcodec/mjpegdec.c See: 1f41cffe1e3e79620f587545bdfcbd7e6e68ed29 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mjpegdec: validate parameters in mjpeg_decode_scan_progressive_acLuca Barbato2013-05-211-0/+5
| | | | | | | | | | | | | | Prevent out of buffer write when decoding broken samples. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit 'c209d0df657f172f42d9bafbcdfa02dfb14f6965'Michael Niedermayer2013-05-212-0/+2
|\| | | | | | | | | | | | | | | | | | | * commit 'c209d0df657f172f42d9bafbcdfa02dfb14f6965': fate.sh: add support for build-only FATE instances Conflicts: doc/fate.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate.sh: add support for build-only FATE instancesDiego Biurrun2013-05-212-0/+2
| | | | | | | | | | | | | | If the "build_only" variable is set in the configuration file, the FATE client will skip running tests and just compile all targets. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'a030279a67ef883df8cf3707774656fa1be81078'Michael Niedermayer2013-05-211-3/+5
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'a030279a67ef883df8cf3707774656fa1be81078': ljpeg: use the correct number of components in yuv Conflicts: libavcodec/mjpegdec.c See: b2e57eb5a3cb9d5dfab601077fa0edee91e06ca5 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ljpeg: use the correct number of components in yuvLuca Barbato2013-05-201-3/+3
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit '8aa3500905fec6c4e657bb291b861d43c34d3de9'Michael Niedermayer2013-05-211-4/+7
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '8aa3500905fec6c4e657bb291b861d43c34d3de9': mjpeg: Validate sampling factors Conflicts: libavcodec/mjpegdec.c See: 08c37a10e9ef7e30d7b7a889ad28c7fa9c49c886 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mjpeg: Validate sampling factorsLuca Barbato2013-05-201-0/+7
| | | | | | | | | | | | | | They must be non-zero. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | avutil/frame: continue to process bufs even if some are emptyXidorn Quan2013-05-201-3/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/md5: move loop inside inner functionGiorgio Vazzana2013-05-201-12/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AMD Athlon(tm) II X3 450 Processor size: 1048576 runs: 1024 time: 5.660 +- 0.023 size: 1048576 runs: 1024 time: 5.661 +- 0.030 size: 1048576 runs: 1024 time: 5.656 +- 0.022 size: 1048576 runs: 1024 time: 5.647 +- 0.026 size: 1048576 runs: 1024 time: 5.428 +- 0.037 size: 1048576 runs: 1024 time: 5.426 +- 0.034 size: 1048576 runs: 1024 time: 5.426 +- 0.034 size: 1048576 runs: 1024 time: 5.428 +- 0.038 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | smacker: remove av_clip_int16()Michael Niedermayer2013-05-201-2/+2
| | | | | | | | | | | | Fixes Ticket2425 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libx264: silence: warning: the address of val will always evaluate as trueMichael Niedermayer2013-05-201-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd/v4l2enc: check write return value.Clément Bœsch2013-05-201-1/+2
| |
* | avcodec/ratecontrol: silence "warning: expected_bits may be used ↵Michael Niedermayer2013-05-201-1/+1
| | | | | | | | | | | | uninitialized in this function" Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/hmac: silence pointer type warningsMichael Niedermayer2013-05-201-5/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-05-201-1/+2
|\| | | | | | | | | | | | | * qatar/master: mpegvideo: unref old current_picture before allocating a new one Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: unref old current_picture before allocating a new oneJanne Grunau2013-05-191-1/+2
| | | | | | | | | | | | Allows decoding with only three frame buffers with frame reference counting. Fixes VAAPI based decoding in vlc which uses only three frame buffers for the mpegvideo-based codecs.
* | Merge commit 'db347280eb3746d7b70888db97f1efe5f06f5624'Michael Niedermayer2013-05-201-6/+16
|\| | | | | | | | | | | | | | | | | | | * commit 'db347280eb3746d7b70888db97f1efe5f06f5624': vorbis: fallback to normal division instead of crashing Conflicts: libavcodec/vorbisdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vorbis: fallback to normal division instead of crashingLuca Barbato2013-05-191-9/+14
| | | | | | | | | | | | | | | | The use of ff_inverse speeds up slightly arches + compilers that do not provide a division faster than the whole machinery, such as ppc32 + gcc4.7, but has operational limits. Drop the always-enable assert and provide a fallback.
* | Merge commit 'ddf1b4a2f8a680126eb611428e4f47e6e5b8c6c0'Michael Niedermayer2013-05-201-4/+4
|\| | | | | | | | | | | | | * commit 'ddf1b4a2f8a680126eb611428e4f47e6e5b8c6c0': vorbis: simplify the inner loop in setup_classifs Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vorbis: simplify the inner loop in setup_classifsLuca Barbato2013-05-191-4/+4
| |
* | Merge commit '36f10380043c8b8c5cbf8c1add8695089cdaa341'Michael Niedermayer2013-05-201-3/+3
|\| | | | | | | | | | | | | * commit '36f10380043c8b8c5cbf8c1add8695089cdaa341': vorbis: use normal integer values for iterators Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vorbis: use normal integer values for iteratorsLuca Barbato2013-05-191-3/+3
| | | | | | | | No need to use fixed-size integers.
* | doc/filters: add RGB geq exampleStefano Sabatini2013-05-201-0/+6
| |
* | doc/filters: extend/fix documentation for the geq filterStefano Sabatini2013-05-201-12/+24
| |
* | Merge commit '98186578a2a21af5bfe6dd71d222dc270f763c7d'Michael Niedermayer2013-05-201-20/+32
|\| | | | | | | | | | | | | | | | | | | * commit '98186578a2a21af5bfe6dd71d222dc270f763c7d': vorbis: refactor vorbis_residue_decode_internal Conflicts: libavcodec/vorbisdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vorbis: refactor vorbis_residue_decode_internalLuca Barbato2013-05-191-20/+32
| |
* | Merge commit 'c360fb174b01170ab3fd3048d4d0acb44aa4e834'Michael Niedermayer2013-05-201-0/+8
|\| | | | | | | | | | | | | * commit 'c360fb174b01170ab3fd3048d4d0acb44aa4e834': win32: Do not use GetProcAddress when compiled for Vista+ Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * win32: Do not use GetProcAddress when compiled for Vista+Jean-Baptiste Kempf2013-05-191-0/+8
| | | | | | | | | | | | Instead link directly to the condition variable functions. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '0b6899f154347cdd0aa66c5ec16ed9c65871766f'Michael Niedermayer2013-05-201-0/+7
|\| | | | | | | | | | | | | * commit '0b6899f154347cdd0aa66c5ec16ed9c65871766f': configure: msvc: Set the target windows version to XP if no target is set Merged-by: Michael Niedermayer <michaelni@gmx.at>