summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* swscale: increase yuv2rgb table headroomMichael Niedermayer2014-12-161-1/+1
| | | | | | | Fixes out of array access Fixes: case2_bad_read_yuv2rgbx32.mp4 Found-by: Michal Zalewski <lcamtuf@coredump.cx> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/mov: fix integer overflow of sizeMichael Niedermayer2014-12-161-3/+3
| | | | | | Fixes: case1_call_stack_overflow.mp4 Found-by: Michal Zalewski <lcamtuf@coredump.cx> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/mov: check atom nesting depthMichael Niedermayer2014-12-162-1/+13
| | | | | | | Fixes call stack overflow Fixes: case1_call_stack_overflow.mp4 Found-by: Michal Zalewski <lcamtuf@coredump.cx> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/utvideodec: Fix handling of slice_height=0Michael Niedermayer2014-12-161-0/+4
| | | | | | | Fixes out of array accesses Fixes: asan_heap-oob_25bcd7e_3783_cov_3553517262_utvideo_rgba_median.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* doc/filters: fix typos and spelling errorsLou Logan2014-12-161-15/+15
| | | | | Prompted-by: Carl Oxwall <@oxwall> Signed-off-by: Lou Logan <lou@lrcd.com>
* avcodec/xface: Add asserts to limit nb_words from becoming too largeMichael Niedermayer2014-12-161-0/+5
| | | | | Approved-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/xface: correct the XFACE_MAX_* valuesMichael Niedermayer2014-12-161-5/+5
| | | | | | | | Fixes out of array access Fixes: asan_stack-oob_32c12e5_2536_cov_2442316831_lena.xface Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/vmdvideo: Check len before using it in method 3Michael Niedermayer2014-12-161-0/+3
| | | | | | | | Fixes out of array access Fixes: asan_heap-oob_4d23ba_91_cov_3853393937_128.vmd Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/hlsenc: Use av_freep() to avoid leaving stale pointers in memoryMichael Niedermayer2014-12-161-2/+2
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/flvdec: Use av_freep() avoid leaving stale pointers in memoryMichael Niedermayer2014-12-161-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/hdsenc: Use av_freep() avoid leaving stale pointers in memoryMichael Niedermayer2014-12-161-6/+6
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavfi: add colorlevels filterPaul B Mahol2014-12-166-2/+328
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avformat/hlsenc: fix hls_write_trailer() on hls_start() failureChristian Suloway2014-12-161-4/+6
| | | | | | | | Close segment I/O context and append segment in hls_write_trailer() only when segment I/O context is allocated. Signed-off-by: Christian Suloway <csuloway@globaleagleent.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* snow_dwt: Don't try and free members of non-existent arraysDerek Buitenhuis2014-12-151-2/+7
| | | | | | | | If allocation fails earlier on, and the next frame is processed, the slice buffer could be left in a state where line and data_stack have already been freed, or are otherwise null pointers. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* vp9/x86: save one register on 32bit idct32x32.Ronald S. Bultje2014-12-161-3/+48
| | | | | | Fixes build on win32. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '6f4364aba9d70dc5fd9f1c88b9c03bf9ea893d40'Michael Niedermayer2014-12-161-1/+1
|\ | | | | | | | | | | | | | | | | | | * commit '6f4364aba9d70dc5fd9f1c88b9c03bf9ea893d40': mov: Fix handling of zero-length metadata values Conflicts: libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Fix handling of zero-length metadata valuesMartin Storsjö2014-12-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 3cec81f4d4, a zero-length metadata value would try to allocate 2*0 bytes, where av_malloc() returns NULL. Always add one to the allocated length, to allow space for a null terminator in the zero-length case. Incidentally, this fixes fate-alac on RVCT 4.0, where a compiler bug seems to mess up the mov muxer to the point that it writes the wrong sort of metadata. Previously this bug was undetected, but since 3cec81f4d4 such mov files started returning AVERROR(ENOMEM) in the mov demuxer. Signed-off-by: Martin Storsjö <martin@martin.st>
* | ffmpeg: Check for subtitle_out malloc failureMichael Niedermayer2014-12-151-0/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/tiffenc: Consistently use ADD_ENTRY1()Michael Niedermayer2014-12-151-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '10d4c5e55e5b23e165aa4c7723073ebe2c2e7da0'Michael Niedermayer2014-12-151-1/+3
|\ \ | |/ | | | | | | | | | | * commit '10d4c5e55e5b23e165aa4c7723073ebe2c2e7da0': tiff: set the correct return value when check_size() fails Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tiff: set the correct return value when check_size() failsVittorio Giovara2014-12-151-1/+3
| | | | | | | | Only one instance affected and solved as other occurences.
* | Merge commit '3c27275c1309190f2d6ed69140b67d014215b6c9'Michael Niedermayer2014-12-151-23/+40
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '3c27275c1309190f2d6ed69140b67d014215b6c9': tiff: Check the check_size() return value and forward it Conflicts: libavcodec/tiffenc.c See: d50aa006fb3430bedc3872ba10e028a714499625 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tiff: Check the check_size() return value and forward itLuca Barbato2014-12-151-23/+40
| | | | | | | | | | | | | | | | | | | | Also use the same type for add_entry and check_size. Bug-Id: CID 700699 CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Signed-off-by: Vittorio Giovara <vittorio.giovarao@gmail.com>
* | Merge commit '4690e01c3aaf495c87127e5dc74aa347197dbc0b'Michael Niedermayer2014-12-151-3/+2
|\ \ | |/ | | | | | | | | | | * commit '4690e01c3aaf495c87127e5dc74aa347197dbc0b': prores: Evaluate all the quantizers Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * prores: Evaluate all the quantizersLuca Barbato2014-12-151-3/+2
| | | | | | | | | | | | | | | | | | Prevent an uninitialized data access. CC: libav-stable@libav.org Bug-Id: CID 703824 / CID 703825 Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '490a3ebf36821b81f73e34ad3f554cb523dd2682'Michael Niedermayer2014-12-150-0/+0
|\ \ | |/ | | | | | | | | | | | | * commit '490a3ebf36821b81f73e34ad3f554cb523dd2682': matroskadec: Fix read-after-free in matroska_read_seek() See: 33301f001747d7a542073c634cc81da5eff051cf Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskadec: Fix read-after-free in matroska_read_seek()Xiaohan Wang2014-12-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | In matroska_read_seek(), |tracks| is assigned at the begining of the function. However, functions like matroska_parse_cues() could reallocate the tracks and invalidate |tracks|. This assigns |tracks| only before using it, so that it will not get invalidated elsewhere. Bug-Id: chromium/427266
* | Merge commit 'd75190aa93206c02cb4f18a66d2c927d6a0198e1'Michael Niedermayer2014-12-153-6/+6
|\ \ | |/ | | | | | | | | | | * commit 'd75190aa93206c02cb4f18a66d2c927d6a0198e1': mpegvideo: move REBASE_PICTURE where it is used Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: move REBASE_PICTURE where it is usedVittorio Giovara2014-12-153-6/+6
| | | | | | | | Drop an unused #undef from h264 decoder.
* | Merge commit '63fcedcf01247f15b72c0d1f959bb3b612853ba8'Michael Niedermayer2014-12-151-1/+0
|\ \ | |/ | | | | | | | | | | * commit '63fcedcf01247f15b72c0d1f959bb3b612853ba8': mpegvideo: remove unused function declaration Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: remove unused function declarationVittorio Giovara2014-12-151-1/+0
| |
* | avcodec/hevc: Print an error if luma_log2_weight_denom is out of rangeMichael Niedermayer2014-12-151-1/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b2bece5e9a4dd96142962c6798e187c77b88bbfa'Michael Niedermayer2014-12-151-1/+1
|\ \ | |/ | | | | | | | | | | * commit 'b2bece5e9a4dd96142962c6798e187c77b88bbfa': hevc: always clip luma_log2_weight_denom Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: always clip luma_log2_weight_denomVittorio Giovara2014-12-151-1/+1
| | | | | | | | | | | | | | Its value shall be between 0 and 7 according to the specifications. CC: libav-stable@libav.org Bug-Id: CID 1257502
* | lavf/concatdec: handle NOPTS start_time.Nicolas George2014-12-151-2/+5
| | | | | | | | | | | | | | Fix trac ticket #3598. Signed-off-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Changelog: Add 10bit sppMichael Niedermayer2014-12-151-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_spp: support 10bit per sampleMichael Niedermayer2014-12-152-23/+79
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/avdct: support >8bit per sample dctsMichael Niedermayer2014-12-153-1/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/ffplay: remove duplicate threads option, this is documented in codecs.*Michael Niedermayer2014-12-151-3/+0
| | | | | | | | | | | | Fixes Ticket3610 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/xmv: Check return code of ff_alloc_extradata()Michael Niedermayer2014-12-151-1/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/flic: se av_freep() to avoid leaving stale extradata pointerMichael Niedermayer2014-12-151-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rtpdec_mpeg4: Use av_freep() to avoid leaving stale extradata pointerMichael Niedermayer2014-12-151-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/xmv: use av_freep() to avoid leaving stale extradata pointerMichael Niedermayer2014-12-151-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/assenc: Use av_freep() to avoid leaving stale pointers in memoryMichael Niedermayer2014-12-151-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avidec: Use av_freep() to avoid leaving stale pointers in memoryMichael Niedermayer2014-12-151-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | configure: create the tests directory like the doc directoryMichael Niedermayer2014-12-151-0/+1
| | | | | | | | | | | | | | | | This fixes an issue where the tests directory is not created for out of tree builds before its needed Tested-by: Dave Yeo <daveryeo@telus.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'bab8d73765238bfeea7a8dfd454f40ac213b3d22'Michael Niedermayer2014-12-153-52/+30
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'bab8d73765238bfeea7a8dfd454f40ac213b3d22': vaapi: wrap codec specific functions in appropiate #ifs Conflicts: libavcodec/vaapi.c See: f2118d44c9f18b3245bec2415c563d94201dcf5a Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vaapi: wrap codec specific functions in appropiate #ifsThiago Santos2014-12-141-0/+4
| | | | | | | | | | | | | | | | | | | | Fix linking when only a subset of vaapi decoders is enabled. Bug-Id: 760 CC: libav-stable@libav.org Signed-off-by: Rémi Denis-Courmont <remi@remlab.net> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '5a82ad644f281701eb22e0359fd732fac67aafa4'Michael Niedermayer2014-12-151-2/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '5a82ad644f281701eb22e0359fd732fac67aafa4': svq1dec: Unbreak the scratch buffer allocation Conflicts: libavcodec/svq1dec.c See: 4213fc5b9eebec53c7d22b770c3f1ceecca1c113 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * svq1dec: Unbreak the scratch buffer allocationMichael Niedermayer2014-12-141-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The input packets are always assumed to be padded and the av_fast_ family of function takes a pointer to a pointer. Thanks to Nicolas Dufresne <nicolas.dufresne@collabora.com> for a similar patch. Introduced in 7b588bb691644e1b3c168b99accf74248a24e3cf. Bug-Id: 766 CC: libav-stable@libav.org Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
OpenPOWER on IntegriCloud