aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* avcodec/rangecoder: Check eMichael Niedermayer2015-11-122-1/+6
| | | | | | | | | | Fixes hang.nut Found-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit b2955b6c5aed11026ec5c7164462899a10cdb937) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avutil/log: fix zero length gnu_printf format string warningGanesh Ajjanagadde2015-11-121-1/+1
| | | | | | | | | | | | This should fix warning reported by fate client: http://fate.ffmpeg.org/report.cgi?time=20150917113121&slot=x86_32-linux-gnu-gcc-4.5.1-have_6regs. Untested. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 63cdb6e4a59e296e27a78ac08f15500b42cd27fc) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavf/webvttenc: Require webvtt file to contain exactly one WebVTT stream.Simon Thelen2015-11-121-0/+6
| | | | | | | | | | | Not requiring this can end up producing hilariously broken files together with -c:s copy (e.g. a webvtt file containing binary subtitle data). Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit b84232694ef0c6897e82b52326c9ea4027c69ec4) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/mjpegdec: Fix decoding RGBA RCT LJPEGMichael Niedermayer2015-11-121-1/+8
| | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 055e56e9f76da3298f1b59bf5ea46f570e844600) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avfilter/af_asyncts: use llabs for int64_tGanesh Ajjanagadde2015-11-121-1/+1
| | | | | | | | | | | | long may not be 64 bit on all platforms; so labs on int64_t is unsafe. This fixes a warning reported in: http://fate.ffmpeg.org/log.cgi?time=20150905071512&log=compile&slot=i386-darwin-clang-polly-3.7 Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit d74123d03eb1047b844bc39fbde26f199c72cbcb) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/g2meet: Also clear tile dimensions on header_failMichael Niedermayer2015-11-121-0/+2
| | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit fb0466699575724923aeddc4490302180dfdf4af) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/g2meet: Fix potential overflow in tile dimensions checkMichael Niedermayer2015-11-121-1/+1
| | | | | | | | | Fixes CID1322351 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 71ec8e1ed6cf4947e204e3e4b5929a44c054f5fb) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/svq1dec: Check init_get_bits8() for failureMichael Niedermayer2015-11-121-1/+4
| | | | | | | | | Fixes: CID1322313 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit a51d4246d8ac96acee735e7e5dedb9d9ef27a594) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/tta: Check init_get_bits8() for failureMichael Niedermayer2015-11-121-1/+5
| | | | | | | | | Fixes: CID1322319 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit f1593e4ca564cdb7f3194a9eee1dea16df41142d) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/vp3: Check init_get_bits8() for failureMichael Niedermayer2015-11-121-1/+4
| | | | | | | | | Fixes CID1322316 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit cbd3cd8eb2de2280d83da5ee875c35581b46a3a3) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* swresample/swresample: Fix integer overflow in seed calculationMichael Niedermayer2015-11-121-1/+1
| | | | | | | | | Fixes CID1322333 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 32f53958b8f6ed4c3c2a7447c1e47d012796fae2) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/mov: Fix integer overflow in FFABSMichael Niedermayer2015-11-121-1/+1
| | | | | | | | | | Fixes: unknown_unknown_19e_414_cov_764838672_bellhamlam.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 053e80f6eaf8d87521fe58ea96886b6ee0bbe59d) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avutil/common: Add FFNABS()Michael Niedermayer2015-11-121-0/+9
| | | | | | | | | | This macro avoids the undefined corner case with the *_MIN values Previous version Reviewed-by: Ganesh Ajjanagadde <gajjanag@mit.edu> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit d6cd614dac579850076ae312c29c4188f8659e46) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avutil/common: Document FFABS() corner caseMichael Niedermayer2015-11-121-0/+6
| | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 733511fb53fedd3adaaeabc5db9d0b29e71ea1d3) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/dump: Fix integer overflow in aspect ratio calculationMichael Niedermayer2015-11-121-2/+2
| | | | | | | | | | Fixes: unknown_unknown_19e_414_cov_764838672_bellhamlam.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit d1bdaf3fb2c45020f72a378bb64eab1bf136581c) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/mxg: Use memmove()Michael Niedermayer2015-11-121-1/+1
| | | | | | | | | | | Fixes undefined behavior Fixes: 1700002963a49da13542e0726b7bb758/unknown_unknown_292_658_cov_2141972066_m1.mxg Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit c7c207aecde0773afc974ce4b7e25dca659bc5b5) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/truemotion1: Check for even widthMichael Niedermayer2015-11-121-0/+4
| | | | | | | | | | | Fixes out of array access Fixes: 87196d8bbc633629fc9dd851fce73e70/asan_heap-oob_26f6853_862_cov_585961513_sonic3dblast_intro-partial.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 63fb5a6aefb4223334001fd2c0d82a5e22e3b528) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/mpeg12dec: Set dimensions in mpeg1_decode_sequence() only in absence ↵Michael Niedermayer2015-11-121-2/+3
| | | | | | | | | | | | | of errors Fixes assertion failure Fixes: 56dcafde14a8397161bb61a16c511179/signal_sigabrt_7ffff6ac8cc9_686_cov_1897408623_microsoft_new_way_to_shove_mpeg2_in_asf.dvr_ms Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit b54e03c9dc2a05324c08b503bfe7535c49c0f281) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/libopusenc: Fix infinite loop on flushing after 0 inputMichael Niedermayer2015-11-121-1/+1
| | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 6701c92fa4269872856c70c3170a9b3291b46247) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/hevc: Check num_long_term_ref_pics_sps to avoid potentially long loopsMichael Niedermayer2015-11-121-0/+2
| | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit ee155c18a2c50b339ba5f6f223fbb6dc343fd471) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/hevc: Fix parsing errorsArthur Grant2015-11-121-2/+4
| | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 781efd07415cdf6f676cca5b22147e5d6be0a4c4) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg: Use correct codec_id for av_parser_change() checkMichael Niedermayer2015-11-121-5/+4
| | | | | | | | | No testcase known Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 45f3d4e63e7807ff3d281f269625ed83f11e4cdc) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg: Check av_parser_change() for failureMichael Niedermayer2015-11-121-2/+7
| | | | | | | | | No testcase known Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit ac0ba6f233698f02ebb75b03242e94333dbe13d4) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg: Check for RAWVIDEO and do not relay only on AVFMT_RAWPICTUREMichael Niedermayer2015-11-121-1/+3
| | | | | | | | | | | The null muxer has AVFMT_RAWPICTURE set but can be fed with non-raw material related to Ticket4778 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit c8890941d63df786bb7a8cab92677416499bb7c3) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg: check avpicture_fill() return valueMichael Niedermayer2015-11-121-1/+5
| | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 15ff3f3fdfc788c0e4e584badd7ec300abfbd716) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/mux: Update sidedata in ff_write_chained()Michael Niedermayer2015-11-121-0/+2
| | | | | | | | | Fixes Ticket4777 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit db91e0edb63afc682ae709f73e3732a4c832944d) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/flashsvenc: Correct max dimension in error messageMichael Niedermayer2015-11-121-1/+1
| | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit b1f59bb6606721ef5eeade4ada541630d51510fe) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/svq1enc: Check dimensionsMichael Niedermayer2015-11-121-0/+5
| | | | | | | | | Fixes assertion failure Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 88fe45e0fe379d7ea86c8ac1e1e8cf2c3f62389f) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/dcaenc: clear bitstream endMichael Niedermayer2015-11-122-1/+5
| | | | | | | | | This avoids leaving uninitialized bits in the output Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit e322b7061f873e8fd33b9e518caa19b87616a528) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* libavcodec/aacdec_template: Use init_get_bits8() in aac_decode_frame()Emanuel Czirai2015-11-121-1/+1
| | | | | | | | | | | related to ticket4749 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 7ab1c57a64b629455805d7fa74a8a20c689fc1f6) Conflicts: libavcodec/aacdec_template.c
* rawdec: fix mjpeg probing buffer size checkwm42015-11-121-1/+1
| | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 4c6beaed9210f01290e5a5a4e377f93f145172cc) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* rawdec: fix mjpeg probingwm42015-11-121-1/+1
| | | | | | | | | | | There can be other headers than "Content-Type:" (in this case, a "Content-Length:" header was following), so checking for a trailing newline is wrong. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit bf51fcd304d5594a4d8eed2bedf0ef0f68fa65f8) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* configure: loongson disable expensive optimizations in gcc O3 optimization周晓勇2015-11-121-1/+1
| | | | | | | | | | | | | | With gcc-4.9.2 loongson faild in test fate-dca, this is caused by option -fexpensive-optimizations in -O3 optimization. We disable it temporarily before the bug been fixed up. Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 2c34389551b6ba3d90f8783806c337e387e603cd) Conflicts: configure
* videodsp: don't overread edges in vfix3 emu_edge.Ronald S. Bultje2015-10-251-4/+11
| | | | | | Fixes trac ticket 3226. Also see Andreas' analysis in https://bugs.debian.org/801745, which was very helpful. (cherry picked from commit 52f84d82bdf1851ecfcc412c1719e5f6f3396209)
* avformat/mp3dec: improve junk skipping heuristicwm42015-10-201-7/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | Commit 2b3e9bbfb529e6bde238aeb511b55ebe461664c8 caused problems for a certain API user: https://code.google.com/p/chromium/issues/detail?id=537725 https://code.google.com/p/chromium/issues/detail?id=542032 The problem seems rather arbitrary, because if there's junk, anything can happen. In this case, the imperfect junk skipping just caused it to read different junk, from what I can see. We can improve the accuracy of junk detection by a lot by checking if 2 consecutive frames use the same configuration. While in theory it might be completely fine for the 1st frame to have a different format than the 2nd frame, it's exceedingly unlikely, and I can't think of a legitimate use-case. This is approximately the same mpg123 does for junk skipping. The set of compared header bits is the same as the libavcodec mp3 parser uses for similar purposes. (cherry picked from commit de1b1a7da9e6ddf42447271e519099a88b389e4a) Conflicts: libavformat/mp3dec.c
* avformat/hls: add support for EXT-X-MAPAnssi Hannula2015-10-151-10/+182
| | | | | | | | | | | | | Without EXT-X-MAP support we miss the first bytes of some streams. These streams worked by luck before byte-ranged segment support was added in da7759b3579de3e98deb1ac58e642b861280ba54 Fixes ticket #4797. (cherry picked from commit 909907948846dedf57a730a4d115d04d1117f9e5) Conflicts: libavformat/hls.c
* avformat/hls: fix segment selection regression on track changes of live streamsAnssi Hannula2015-10-151-0/+1
| | | | | | | | | | | | | | | | | Commit ad701326b43078b90 ("avformat/hls: open playlists immediately when AVDISCARD_ALL is dropped") inadvertently caused first_packet to never be cleared, causing select_cur_seq_no() to not use the specific code for live streams. In practice this means that when the user selects a different audio track during live stream (i.e. non-VOD) playback, there may be some additional delay as the code might select an incorrect segment at first, and we have to wait for video to catch audio (if too late segment was selected) or to download more following audio segments (if too early segment was selected). Fix that by restoring the zeroing of first_packet. (cherry picked from commit fd74d45d5158812675105a3b4aeb29c67b82f7e8)
* lavf/matroskadec: Fully parse and repack MP3 packetsRodger Combs2015-10-091-1/+3
| | | | | | | Fixes https://trac.ffmpeg.org/ticket/4776 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit b4b2717ffe89940999eeca7317190f729b27f472)
* avcodec/h264_mp4toannexb_bsf: Reorder operations in nal_size checkMichael Niedermayer2015-10-091-1/+1
| | | | | | | Fixes Ticket4778 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 2bb54b82b5094fd906aa28c0443be08c95662a31)
* avformat/oggenc: Check segments_count for headers tooMichael Niedermayer2015-10-091-4/+7
| | | | | | | | Fixes infinite loop and segfault in ogg_buffer_data() Fixes Ticket4806 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 81a8701eb52d2b6469ae16ef442ce425388141b7)
* avformat/segment: atomically update list if possibleMichael Niedermayer2015-10-091-2/+12
| | | | | | | Fixes Ticket4802 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit e2b19a533dbb4cb0fba85261ea835316381bc907)
* avformat/avidec: Workaround broken initial frameMichael Niedermayer2015-10-091-1/+2
| | | | | | | Fixes Ticket4851 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 3e2ef00394b8079e93835d47c993868229f07502)
* hevc: properly handle no_rasl_output_flag when removing pictures from the DPBHendrik Leppkes2015-10-093-1/+7
| | | | | | | | Fixes ticket #4185. Reviewed-By: Mickael Raulet <Mickael.Raulet@insa-rennes.fr> Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com> (cherry picked from commit 0118158efa8e45761f9f65a3bb74f33907bd2aec)
* hevc: fix wpp threading deadlock.Ronald S. Bultje2015-10-091-0/+2
| | | | | Fixes ticket 4258. (cherry picked from commit 74e4948235bc8f8946eeca20525258bbf383f75d)
* avcodec/ffv1: seperate slice_count from max_slice_countMichael Niedermayer2015-10-094-11/+16
| | | | | | | | | | | Fix segfault with too large slice_count Fixes Ticket4879 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit aa6c43f3fdec8a7518534b9dab20c9eb4be11568) Conflicts: libavcodec/ffv1enc.c
* lavf/img2dec: Fix memory leakPrzemysław Sobala2015-10-091-9/+23
| | | | | | | Fixes #4886 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 01dd7e025c246d9001f1a30f4a5d8fa2936d1a5e)
* avcodec/mp3: fix skipping zeroswm42015-10-091-1/+3
| | | | | | | | | | | | | | | | | | Commits 43bc5cf9 and c5371f77 add code for skipping initial zeros in mp3 packets. This code forgot to report to the user that data was skipped at all. Since audio codecs allow partial packet decoding, the user application has to rely on the return value. It will remove the data reported as consumed by the decoder, and feed it to the decoder again. This resulted in the mp3 frame after the zero region to be decoded over and over again, until the zero region was finally skipped by the application. Fix this by including the amount of skipped bytes to the number of consumed bytes returned by the decode call. Fixes trac ticket #4890. (cherry picked from commit cb1da9fb8d71bb611a7b0028914c97afc3f5711d)
* avformat/srtdec: make sure we probe a numberClément Bœsch2015-10-091-1/+1
| | | | | | Fixes regression since 7218352e0228028dfa009a3799ec93fd041065f1: WebVTT files were matching the SRT probing. (cherry picked from commit 40d9d6de90c3652f4c468ab14976c7faf5e40c07)
* avformat/srtdec: more lenient first line probingClément Bœsch2015-10-091-2/+4
| | | | | Fixes Ticket #4898 (cherry picked from commit 7218352e0228028dfa009a3799ec93fd041065f1)
* doc: mention libavcodec can decode Opus nativelyJames Almer2015-09-201-2/+2
| | | | | Signed-off-by: James Almer <jamrial@gmail.com> (cherry picked from commit fd9ac48dc8aebcbd601af34336234d5102b36e21)