aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* avcodec/wavpackenc: print channel count in av_log calln2.8.5James Almer2016-01-151-1/+1
| | | | | | | Fixes a warning with -Wformat-extra-args (cherry picked from commit 17e7fdf61a04f52c499e2d06eab2cf2d22343aa9) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* configure: bump copyright year to 2016James Almer2016-01-151-1/+1
| | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> (cherry picked from commit 78129978f02f27d76ecaf2cd1a7bf7a47253fdab) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Update for 2.8.5Michael Niedermayer2016-01-153-2/+45
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/hls: Even stricter URL checksMichael Niedermayer2016-01-151-1/+5
| | | | | | | | | This fixes a null pointer dereference at least Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit cfda1bea4c18ec1edbc11ecc465f788b02851488) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/hls: More strict url checksMichael Niedermayer2016-01-151-0/+4
| | | | | | | | | No case is known where these are needed Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 6ba42b6482c725a59eb468391544dc0c75b8c6f0) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/pngenc: Fix mixed up linesizesMichael Niedermayer2016-01-151-2/+2
| | | | | | | | | | | Fixes out of array accesses Fixes: 0cf176e6d3ab9fe924f39738e513f547/asan_generic_4a54aa_3431_aaa28be1cb32e307a9890cad06f84fba.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 8f4c3e4b92212d98f5b9ca2dee13e076effe9589) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/pngenc: Replace memcpy by av_image_copy()Michael Niedermayer2016-01-151-6/+3
| | | | | | | | | | | Fixes out of array access Fixes: 0cf176e6d3ab9fe924f39738e513f547/asan_generic_4a54aa_3431_aaa28be1cb32e307a9890cad06f84fba.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 7ec9c5ce8a753175244da971fed9f1e25aef7971) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* swscale/vscale: Check that 2 tap filters are bilinear before using bilinear codeMichael Niedermayer2016-01-152-7/+26
| | | | | | | | | | | Fixes: out of array reads Fixes: 07e8b9c5d348ccdf7add0f37de20cf6c/asan_heap-oob_27e8df7_6849_e56653f768070ec8cb52f587048444c2.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit eb7802afefb7af4da50bc56818cdab9da07de7d0) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* swscale: Move VScalerContext into vscale.cMichael Niedermayer2016-01-152-9/+10
| | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 7b6e6895f2cbfa90a39874d03e2fac392bcbd33b) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* swscale/utils: Detect and skip unneeded sws_setColorspaceDetails() callsMichael Niedermayer2016-01-151-4/+18
| | | | | | | | | This avoids running various table inits unnecessarily Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit cc538e9dbd14b61d1ac8c9fa687d83289673fe90) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* swscale/yuv2rgb: Increase YUV2RGB table headroomMichael Niedermayer2016-01-151-2/+2
| | | | | | | | | | | | This makes SWS more robust Fixes: 07650a772d98aa63b0fed6370dc89037/asan_heap-oob_27ddeaf_2657_2c81ff264dee5d9712cb3251fb9c3bbb.264 Fixes: out of array read Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 8f3a9a8c278acf886f70a1d743bc07b6f9c7b51a) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* swscale/yuv2rgb: Factor YUVRGB_TABLE_LUMA_HEADROOM outMichael Niedermayer2016-01-152-44/+46
| | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 5e5f82a28737fba4402259617500911cc37e3674) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/hls: forbid all protocols except http(s) & fileMaxim Andreev2016-01-151-0/+4
| | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 7145e80b4f78cff5ed5fee04d4c4d53daaa0e077) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/aviobuf: Fix end check in put_str16()Michael Niedermayer2016-01-151-0/+2
| | | | | | | | | | | Fixes out of array read Fixes: 03c406ec9530e594a074ce2979f8a1f0/asan_heap-oob_7dec26_4664_37c52495b2870a2eaac65f53958e76c1.flac Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 115fb6d03ef6310732b42258d8c3cd1839cfb74b) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/asfenc: Check ptsMichael Niedermayer2016-01-151-0/+5
| | | | | | | | | | | Fixes integer overflow Fixes: 0063df8be3aaa30dd6d76f59c8f818c8/signal_sigsegv_7b7b59_3634_bf418b6822bbfa68734411d96b667be3.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 7c0b84d89911b2035161f5ef51aafbfcc84aa9e2) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/mpeg4video: Check time_incrMichael Niedermayer2016-01-153-5/+15
| | | | | | | | | | | | | Fixes assertion failure Fixes out of memory access Fixes: test_casex.ivf Found-by: Tyson Smith <twsmith@mozilla.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 7c97946d6131b31340954a3f603b6bf92590a9a5) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/wavpackenc: Check the number of channelsMichael Niedermayer2016-01-151-0/+5
| | | | | | | | | They are stored in a byte, thus more than 255 is not possible Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 59c915a403af32c4ff5126625b0cc7e38f4beff9) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/wavpackenc: Headers are per channelMichael Niedermayer2016-01-151-1/+1
| | | | | | | | | | | Fixes: 1b8b83a53bfa751f01b1daa65a4758db/signal_sigabrt_7ffff6ae7cb7_7488_403f71d1a2565b598d01b6cb110fac8f.aiff Fixes: assertion failure Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 26757b0279b4b93c6066c2151d4d3dbd2ec266bf) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/aacdec_template: Check id_mapMichael Niedermayer2016-01-151-0/+4
| | | | | | | | | | | Fixes index out of bounds error Fixes: aac_index_out_of_bounds.wmv Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 590863876d1478547640304a31c15809c3618090) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/dvdec: Fix "left shift of negative value -254"Michael Niedermayer2016-01-151-1/+1
| | | | | | | | | | Fixes: dvdec_left_shift.avi Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 93ac72a98dff592ffc174cfb36a8975dfbf145ae) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/g2meet: Check for ff_els_decode_bit() failure in ↵Michael Niedermayer2016-01-151-1/+6
| | | | | | | | | | | | | epic_decode_run_length() Fixes invalid shift Fixes: g2m_left_shift_2.wmv Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 030c7f0309ec0e3cadb990408b4bb9b7fd739425) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/mjpegdec: Fix negative shiftMichael Niedermayer2016-01-151-1/+1
| | | | | | | | | | Fixes: mjpeg_left_shift.avi Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit d86d7b2486cd5c31db8e820d8a89554abf19567e) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/mss2: Check for repeat overflowMichael Niedermayer2016-01-151-1/+6
| | | | | | | | | | Fixes: mss2_left_shift.wmv Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit e273dade78943e22b71d0ddb67cd0d737fc26edf) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat: Add integer fps from 31 to 60 to get_std_framerate()Michael Niedermayer2016-01-152-4/+8
| | | | | | | | | Fixes Ticket 5106 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 2039b3e7511ef183dae206575114e15b6d99c134) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/ivfenc: fix division by zeroMichael Niedermayer2016-01-151-2/+3
| | | | | | | | | Fixes Ticket 5115 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 5c8467a07c654f6acd9e8e3a436cd5b746bb2f44) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/mpegvideo_enc: Clip bits_per_raw_sample within valid rangeMichael Niedermayer2016-01-151-0/+1
| | | | | | | | | | | Fixes out of array read Fixes: test_case-mdc.264 (b47be15a120979f5a1a945c938cbef33) Found-by: Tyson Smith <twsmith@mozilla.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 13f266b50cc7554028d22480b7e4383968e64a63) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avfilter/vf_scale: set proper out frame color rangeThomas Mundt2016-01-151-0/+2
| | | | | | | | | | | Prevents that following scalers in the filter chain will do unintentional color range conversions. Fixes Ticket #5096 Signed-off-by: Thomas Mundt <loudmax@yahoo.de> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 73ce8162f3499cf0e86d1d80dea53324bd62bcb3) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/motion_est: Fix mv_penalty table sizeMichael Niedermayer2016-01-156-17/+18
| | | | | | | | | | | | Fixes out of array read Found-by: Tyson Smith <twsmith@mozilla.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 5b4da8a38a5ed211df9504c85ce401c30af86b97) Conflicts: libavcodec/motion_est.h
* avcodec/h264_slice: Fix integer overflow in implicit weight computationMichael Niedermayer2016-01-151-2/+2
| | | | | | | | | Fixes mozilla bug 1230423 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 7cc01c25727a96eaaa0c177234b626e47c8ea491) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* swscale/utils: Use normal bilinear scaler if fast cannot be used due to tiny ↵Michael Niedermayer2016-01-151-0/+6
| | | | | | | | | | | dimensions Fixes Ticket4960 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 1edf129cbc897447a289ca8b045853df5df1bab3) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/put_bits: Always check buffer end before writingMichael Niedermayer2016-01-151-6/+14
| | | | | | | | | This causes a overall slowdown of 0.1 % (tested with mpeg4 single thread encoding of matrixbench at QP=3) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit cccb0ffccc3723acc7aab3a859b24743596dd9c0) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* mjpegdec: extend check for incompatible values of s->rgb and s->lsAndreas Cadhalpun2016-01-151-1/+2
| | | | | | | | | | | | | | | | | This can happen if s->ls changes from 0 to 1, but picture allocation is skipped due to s->interlaced. In that case ff_jpegls_decode_picture could be called even though the s->picture_ptr frame has the wrong pixel format and thus a wrong linesize, which results in a too small zero buffer being allocated. This fixes an out-of-bounds read in ls_decode_line. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit 7ea2db6eafa0a8a9497aab20be2cfc8742a59072) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* swscale/utils: Fix intermediate format for cascaded alpha downscalingMichael Niedermayer2016-01-151-0/+3
| | | | | | | | | Fixes Ticket4926 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit b83d8be6bff7d645469a623aee0b380541da15cf) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/mov: Update handbrake_version threshold for full mp3 parsingMichael Niedermayer2016-01-151-1/+1
| | | | | | | | | Fixes: Endangered\ Species\ 1x01\ Collecting\ Merl.mp4 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit d3b6a9abacc9df124388ca2c38bf9456570f5d59) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* x86/float_dsp: zero extend offset from ff_scalarproduct_float_sseJames Almer2016-01-081-3/+3
| | | | | | Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com> (cherry picked from commit dc79824deb6ac0ce236589c618744b33629201cd)
* avfilter/vf_zoompan: do not free frame we pushed to lavfiPaul B Mahol2016-01-021-1/+1
| | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> (cherry picked from commit 8bcd1997eadb0d79a049227a1d1afe6111397baa) Fixes ticket #5113.
* nuv: sanitize negative fps rateAndreas Cadhalpun2015-12-201-0/+9
| | | | | | Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit f6830cf5ba03fdcfcd81a0358eb32d4081a2fcce) Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* nutdec: reject negative value_len in read_sm_dataAndreas Cadhalpun2015-12-201-1/+1
| | | | | | | | | | | | | If it is negative, it can cause the byte position to move backwards in avio_skip, which in turn makes sm_size negative and thus size larger than the size of the packet buffer, causing invalid writes in avio_read. Also fix potential overflow of avio_tell(bc) + value_len. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit ce10f572c12b0d172c72d31d8c979afce602bf0c) Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* xwddec: prevent overflow of lsize * avctx->heightAndreas Cadhalpun2015-12-201-1/+1
| | | | | | | | | | | This is used to check if the input buffer is large enough, so if this overflows it can cause a false negative leading to a segmentation fault in bytestream2_get_bufferu. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit 9d38f06d05efbb9d6196c27668eb943e934943ae) Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* nutdec: only copy the header if it existsAndreas Cadhalpun2015-12-201-1/+2
| | | | | | | | | | Fixes ubsan runtime error: null pointer passed as argument 2, which is declared to never be null Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit 9f82506c79874edd7b09707ab63d9e72078de8f9) Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* exr: fix out of bounds read in get_codeAndreas Cadhalpun2015-12-201-5/+5
| | | | | | | | | This macro unconditionally used out[-1], which causes an out of bounds read, if out is the very beginning of the buffer. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit 90b99a81071d10e6b5efe86a4602d54d4f45bbcb) Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* on2avc: limit number of bits to 30 in get_egolombAndreas Cadhalpun2015-12-201-2/+9
| | | | | | | | | | | | More don't fit into the integer output. Also use get_bits_long, since get_bits only supports reading up to 25 bits, while get_bits_long supports the full integer range. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit 4d5c3b02e9d2c9a630ca433fabca43285879e0b8) Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* Update Changelogn2.8.4Michael Niedermayer2015-12-201-1/+24
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* rawdec: only exempt BIT0 with need_copy from buffer sanity checkAndreas Cadhalpun2015-12-201-1/+1
| | | | | | | | Otherwise the too samll buffer is directly used in the frame, causing segmentation faults, when trying to use the frame. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* mlvdec: check that index_entries existAndreas Cadhalpun2015-12-201-0/+5
| | | | | | | This fixes NULL pointer dereferencing. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/mpeg4videodec: also for empty partitioned slicesMichael Niedermayer2015-12-191-1/+1
| | | | | | | | | | | Fixes assertion failure Fixes: id_acf3e47f864e1ee4c7b86c0653e0ff31e5bde56e.m4v Found-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 70f13abb4f9a376ddc0d2c566739bc3c6a0c47e7) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/h264_refs: Fix long_idx checkMichael Niedermayer2015-12-191-1/+1
| | | | | | | | | | | Fixes out of array read Fixes mozilla bug 1233606 Found-by: Tyson Smith Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit b92b4775a0d07cacfdd2b4be6511f3cb362c977b) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/h264_mc_template: prefetch list1 only if it is used in the MBMichael Niedermayer2015-12-181-1/+2
| | | | | | | | | | Fixes ubsan warning Fixes Mozilla bug 1230276 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit c8ea57664fe3ad611c9ecd234670544ddff7ca55) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/h264_slice: Simplify ref2frm indexingMichael Niedermayer2015-12-181-9/+9
| | | | | | | | | | This also suppresses a ubsan warning Fixes Mozilla bug 1230247 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit ef8f6464a55db730cab8c48a1a51fa4e6ca12107) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Revert "avcodec/aarch64/neon.S: Update neon.s for transpose_4x4H"Michael Niedermayer2015-12-171-2/+2
| | | | | | | | | The change was not correct and broke H264 This reverts commit cd83f899c94f691b045697d12efa21f83eb2329f. (cherry picked from commit 95b59bfb9d9e47de8438183a035e02667946f27c) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>