summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* postproc/postprocess_template: remove empty commentsMichael Niedermayer2013-05-23
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* s302m encoderDarryl Wallace2013-05-23
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* escape130: switch to init_get_bits8()Paul B Mahol2013-05-23
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avcodec/wavpack: remove ;;Michael Niedermayer2013-05-23
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* fraps: set avctx->color_rangePaul B Mahol2013-05-23
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* doc/general: remove obsolete info about APE decoderPaul B Mahol2013-05-23
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-05-23
|\ | | | | | | | | | | | | * qatar/master: wavpack: check packet size early Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wavpack: check packet size earlyLuca Barbato2013-05-22
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit '3f0b6d7a6248a33df37b98cfcb37a1acce263f62'Michael Niedermayer2013-05-23
|\| | | | | | | | | | | | | | | | | | | * commit '3f0b6d7a6248a33df37b98cfcb37a1acce263f62': wavpack: use bytestream2 in wavpack_decode_block Conflicts: libavcodec/wavpack.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wavpack: use bytestream2 in wavpack_decode_blockLuca Barbato2013-05-22
| | | | | | | | | | | | | | Prevent most out of buffer reads. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit 'f36d7831d96aeb072db5a2b78892a534d96e288e'Michael Niedermayer2013-05-23
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'f36d7831d96aeb072db5a2b78892a534d96e288e': pixdesc: mark gray8 as pseudopal Conflicts: libavutil/pixdesc.c No change as gray8 was already marked as pseudopal in FFmpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pixdesc: mark gray8 as pseudopalAnton Khirnov2013-05-22
| | | | | | | | | | | | | | Many functions treat it as such already. Fixes Bug 499. CC:libav-stable@libav.org
* | Merge commit '3eae9b030cbbdc263f69834b791624613032d548'Michael Niedermayer2013-05-23
|\| | | | | | | | | | | | | * commit '3eae9b030cbbdc263f69834b791624613032d548': mpegvideo: unref buffers in ff_mpeg_unref_picture on frame size changes Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: unref buffers in ff_mpeg_unref_picture on frame size changesJanne Grunau2013-05-22
| | | | | | | | | | | | ff_mpeg_unref_picture clears the flag indicating that the frame needs to be reallocated after a frame size change. Since we have now reference counted buffers we can unref the buffers immediately.
* | avformat/utils: Keep internal and external av_read_frame() packets in sync.Dale Curtis2013-05-23
| | | | | | | | | | | | | | | | | | | | | | Otherwise, during error conditions, the caller will be left with dangling pointers to a destructed packet => boom. BUG=242786 TEST=ffmpeg_regression_tests Commit slightly simplified by commiter Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/mp: try to pass interlaced & tff flagsPaul B Mahol2013-05-22
| | | | | | | | | | | | This makes mp=softpulldown actually useful. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavfi/lut3d: avoid overread.Clément Bœsch2013-05-22
| |
* | avcodec/aic: Fix vlc value checksMichael Niedermayer2013-05-22
| | | | | | | | | | | | | | Fixes out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | proresdec: Fix end conditionMichael Niedermayer2013-05-22
| | | | | | | | | | | | | | | | | | | | Fixes out of array writes No FFmpeg release is affected by this This also fixes some artifacts Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | smvjpegdec: use av_pix_fmt_desc_get() avoid direct table accessMichael Niedermayer2013-05-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | v4l2: make possible to disable libv4l2 at runtime.Clément Bœsch2013-05-22
| | | | | | | | | | | | Also disable it by default since it looks currently buggy. The usefulness of such library is mostly limited to backward compatibility with very old devices.
* | lavfi: add lut3d filter.Clément Bœsch2013-05-22
| | | | | | | | Fixes part of Ticket #2517.
* | shorten: fix "off by padding" bugMichael Niedermayer2013-05-22
| | | | | | | | | | | | | | Fixes array overread Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Support playing SMV files.Ash Hughes2013-05-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avienc: Disallow the first frame to be skipedMichael Niedermayer2013-05-22
| | | | | | | | | | | | Fixes Ticket2386 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-05-22
|\| | | | | | | | | | | | | * qatar/master: configure: Enable the strtod workaround when building for bionic Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Enable the strtod workaround when building for bionicMartin Storsjö2013-05-21
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2013-05-22
|\ \ | | | | | | | | | | | | | | | | | | * cehoyos/master: Add a fate test for ProRes Transparency. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Add a fate test for ProRes Transparency.Carl Eugen Hoyos2013-05-21
| | |
* | | j2kdec & jpeg2000dec: check lengthinc against array sizeMichael Niedermayer2013-05-22
| | | | | | | | | | | | | | | | | | | | | Fixes out of array reads Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | j2k & jpeg2000dec: reset numX/Ytiles if tiles failed allocationMichael Niedermayer2013-05-22
| | | | | | | | | | | | | | | | | | | | | Fixes null pointer dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avcodec/jpeg2000dec: Port tile size check from j2kdecMichael Niedermayer2013-05-22
| | | | | | | | | | | | | | | | | | Fixes potential integer overflow Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | jpeg2000dec: check TPsotMichael Niedermayer2013-05-22
| | | | | | | | | | | | | | | | | | | | | Fixes out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | jpeg2000dec: read and check curtilenoMichael Niedermayer2013-05-22
| | | | | | | | | | | | | | | | | | | | | | | | Fixes out of array accesses Code ported from j2kdec Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | jpeg2000dec & j2kdec: Fix return type of get_sot()Michael Niedermayer2013-05-22
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | vcodec/jpeg2000dec: fix av_log() typeMichael Niedermayer2013-05-22
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | j2kdec: cosmetics from jpeg2000decMichael Niedermayer2013-05-22
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avcodec/jpeg2000dec: merge bytestream2 reading from j2kdecMichael Niedermayer2013-05-22
| | | | | | | | | | | | | | | | | | | | | This fixes at least one out of array access Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avcodec/jpeg2000dec: get_qcx, fix stack and heap overwritesMichael Niedermayer2013-05-22
|/ / | | | | | | | | | | | | | | | | 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-21
| | | | | | | | 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-21
| |
* | avutil/pixfmt: add forgotten deprecated to YUVJ411Michael Niedermayer2013-05-21
| | | | | | | | | | Found-by: wm4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000dec: Check ncomponents and tile dimensionsMichael Niedermayer2013-05-21
| | | | | | | | | | | | | | | | | | 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-21
| | | | | | | | | | | | 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-21
| | | | | | | | | | | | This should simplify merging Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | j2kdec: s/decode_packets/jpeg2000_decode_packets/Michael Niedermayer2013-05-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/geq: prefer symbolic constantsStefano Sabatini2013-05-21
| | | | | | | | Hopefully enhance readability.
* | lavfi/geq: add aliases for RGB optionsStefano Sabatini2013-05-21
| |
* | vp3: zero allocated tablesPaul B Mahol2013-05-21
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | seek-test: make duration user configurableMichael Niedermayer2013-05-21
| | | | | | | | | | | | Previously this was hardcoded to 4 seconds Signed-off-by: Michael Niedermayer <michaelni@gmx.at>