summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit '11a9320de54759340531177c9f2b1e31e6112cc2'Clément Bœsch2017-05-03
|\ | | | | | | | | | | | | | | | | * commit '11a9320de54759340531177c9f2b1e31e6112cc2': build: Move build-system-related helper files to a separate subdirectory "ffbuild" directory name is used instead of "avbuild". Merged-by: Clément Bœsch <u@pkh.me>
| * build: Move build-system-related helper files to a separate subdirectoryDiego Biurrun2016-12-22
| | | | | | | | This unclutters the top-level directory and groups related files together.
* | Merge commit 'f9edc734e0ca3f6ef06c1ad0bd2c19c0c66f1ffa'Clément Bœsch2017-05-03
|\| | | | | | | | | | | | | | | | | * commit 'f9edc734e0ca3f6ef06c1ad0bd2c19c0c66f1ffa': ratecontrol: Drop xvid-rc-related struct members unused after a6901b9c6 This commit is a noop, see 99b35a51ccbe2fc98530e5cf7529e7d377e1165e Merged-by: Clément Bœsch <u@pkh.me>
| * ratecontrol: Drop xvid-rc-related struct members unused after a6901b9c6Diego Biurrun2016-12-21
| |
* | Merge commit '5b26d3b789bd19a32dbe1e9c7ccab9498de7ee9b'Clément Bœsch2017-05-03
|\| | | | | | | | | | | | | | | | | * commit '5b26d3b789bd19a32dbe1e9c7ccab9498de7ee9b': nvenc: Update check for lookahead This commit is a noop, see 67db4ff3b66e96a20ddf1c264d07e146334ae88e Merged-by: Clément Bœsch <u@pkh.me>
| * nvenc: Update check for lookaheadRuta Gadkari2016-12-21
| | | | | | | | | | | | By default it is -1. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'a0c443a3980dc22eb02b067ac4cb9ffa2f9b04d2'Clément Bœsch2017-05-03
|\| | | | | | | | | | | | | | | | | * commit 'a0c443a3980dc22eb02b067ac4cb9ffa2f9b04d2': aarch64: vp9itxfm: Use the offset parameter to movrel This commit is a noop, see 8b11a89c06b94632d545f67ca508bd9c05c435ac Merged-by: Clément Bœsch <u@pkh.me>
| * aarch64: vp9itxfm: Use the offset parameter to movrelMartin Storsjö2016-12-19
| | | | | | | | | | | | This fixes build failures for iOS, broken since cad42fadcd2c. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'fc322d6a70189da24dbd445c710bb214eb031ce7'Clément Bœsch2017-05-03
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'fc322d6a70189da24dbd445c710bb214eb031ce7': tta: Convert to the new bitstream reader mlp: Convert to the new bitstream reader unary: Convert to the new bitstream reader This merge is a noop, see http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html Merged-by: Clément Bœsch <u@pkh.me>
| * tta: Convert to the new bitstream readerAlexandra Hájková2016-12-19
| |
| * mlp: Convert to the new bitstream readerAlexandra Hájková2016-12-19
| |
| * unary: Convert to the new bitstream readerAlexandra Hájková2016-12-19
| |
* | Merge commit '45286a625c6ced1f5c4c842244cbb4509429abba'Clément Bœsch2017-05-03
|\| | | | | | | | | | | | | | | | | | | * commit '45286a625c6ced1f5c4c842244cbb4509429abba': h264dec: make sure to only end a field if it has been started This commit is a noop. Our h264 slicing handling is different and does not seem to be affected by the issue. Merged-by: Clément Bœsch <u@pkh.me>
| * h264dec: make sure to only end a field if it has been startedAnton Khirnov2016-12-19
| | | | | | | | | | | | | | | | Calling ff_h264_field_end() when the per-field state is not properly initialized leads to all kinds of undefined behaviour. CC: libav-stable@libav.org Bug-Id: 977 978 992
* | avcodec/svq3: Reject dx/dy beyond 16bitMichael Niedermayer2017-05-03
| | | | | | | | | | | | The code does use 16bit sized arrays later so larger deltas would not work Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/svq3: Increase offsets to prevent integer overflowsMichael Niedermayer2017-05-03
| | | | | | | | | | | | | | Fixes: 1280/clusterfuzz-testcase-minimized-6102353767825408 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavc/jpeg2000dec: Fix jp2 inner atom size used for overread checks.Carl Eugen Hoyos2017-05-03
| |
* | avcodec/decode: also check for FF_CODEC_CAP_SETS_PKT_DTS in audio decodersJames Almer2017-05-02
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
* | avutil/softfloat: use ldexp(), fixes undefined shiftMichael Niedermayer2017-05-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg: count packets when queuedMuhammad Faiz2017-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Because write_packet() fakely writes packets to muxer by queueing them when muxer hasn't been initialized, it should also increment frame_number fakely. This is required because code in do_streamcopy() rely on frame_number. Should fix Ticket6227 Reviewed-by: James Almer <jamrial@gmail.com> Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
* | avcodec/decode: do not treat discarded frames as eof when drainingMuhammad Faiz2017-05-03
| | | | | | | | | | | | | | | | Fix fate failures: make fate-mov THREADS=32 Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
* | avfilter/interlace: add complex vertical low-pass filterThomas Mundt2017-05-02
| | | | | | | | | | | | | | This complex (-1 2 6 2 -1) filter slightly less reduces interlace 'twitter' but better retain detail and subjective sharpness impression compared to the linear (1 2 1) filter. Signed-off-by: Thomas Mundt <tmundt75@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
* | lavf/nutdec: Fix an impossible condition, regression since e0c53c34.Carl Eugen Hoyos2017-05-02
| | | | | | | | Fixes ticket #6362.
* | avcodec/internal: update FF_CODEC_CAP_SETS_PKT_DTS doxyJames Almer2017-05-01
| | | | | | | | The code it refers to was moved to decode.c in 00fb745a10a151791ce2e49ba3e463bd17ea9251
* | tools/target_dec_fuzzer: Use avcodec_register_all() instead of register_all()Michael Niedermayer2017-05-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavc/mips/iirfilter_mips: Include config.h.Carl Eugen Hoyos2017-05-01
| | | | | | | | | | Fixes the following warning: libavcodec/mips/iirfilter_mips.c:57:5: warning: "HAVE_INLINE_ASM" is not defined
* | lavc/mips/hevc_idct_msa: Add missing const qualifier.Carl Eugen Hoyos2017-05-01
| | | | | | | | | | Fixes many warnings: initialization discards 'const' qualifier from pointer target type
* | avcodec/indeo2: Check remaining bits in ir2_decode_plane()Michael Niedermayer2017-05-01
| | | | | | | | | | | | | | | | Fixes: 1290/clusterfuzz-testcase-minimized-5815578902134784 Fixes: timeout Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/vp3: Check remaining bits in unpack_dct_coeffs()Michael Niedermayer2017-05-01
| | | | | | | | | | | | | | | | | | Decreases the time spend decoding junk. May fix: 1283/clusterfuzz-testcase-minimized-6221126759874560 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | doc/developer: Add terse documentation of assumed C implementation defined ↵Michael Niedermayer2017-05-01
| | | | | | | | | | | | | | behavior Suggested-by: "Ronald S. Bultje" <rsbultje@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/bmp: Use ff_set_dimensions()Michael Niedermayer2017-05-01
| | | | | | | | | | | | | | | | | | Fixes out of memory Fixes: 1282/clusterfuzz-testcase-minimized-5400131681648640 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | libavformat/http: Ignore expired cookiesMicah Galizia2017-05-01
| | | | | | | | | | Signed-off-by: Micah Galizia <micahgalizia@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | fate/exr : add test for negative float valueMartin Vignali2017-05-01
| | | | | | | | | | | | | | the tested sample contain negative value in the red channel need to be clip to zero, and not set to MAX_RED Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | fate/exr : add tests for piz uncompressMartin Vignali2017-05-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | libavcodec/exr : fix piz uncompress on big endianMartin Vignali2017-05-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/options: do a more thorough clean up in avcodec_copy_context()James Almer2017-04-30
| | | | | | | | | | | | | | | | | | Free coded_frame, coded_side_data and unref hw_device_ctx to prevent potential leaks. Reviewed-by: Aaron Levinson <alevinsn@aracnet.com> Tested-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
* | avcodec/options: factorize avcodec_copy_context() cleanup codeJames Almer2017-04-30
| | | | | | | | | | | | Reviewed-by: Aaron Levinson <alevinsn@aracnet.com> Tested-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat/matroskaenc: add support for writing Content Light Level elementsJames Almer2017-04-30
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat/matroskadec: export Content Light Level metadataJames Almer2017-04-30
| | | | | | | | | | | | Based on a patch by Hendrik Leppkes Signed-off-by: James Almer <jamrial@gmail.com>
* | Merge commit 'c2fa6bb0e8703a7a6aa10e11f9ab36094416d83f'James Almer2017-04-30
|\| | | | | | | | | | | | | | | | | * commit 'c2fa6bb0e8703a7a6aa10e11f9ab36094416d83f': mpeg12dec: move setting first_field to mpeg_field_start() This commit is a noop, see 2f6f2f4f73c068979829e785d08cb1dd345c7fc8 Merged-by: James Almer <jamrial@gmail.com>
| * mpeg12dec: move setting first_field to mpeg_field_start()Anton Khirnov2016-12-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For field picture, the first_field is set based on its previous value. Before this commit, first_field is set when reading the picture coding extension. However, in corrupted files there may be multiple picture coding extension headers, so the final value of first_field that is actually used during decoding can be wrong. That can lead to various undefined behaviour, like predicting from a non-existing field. Fix this problem, by setting first_field in mpeg_field_start(), which should be called exactly once per field. CC: libav-stable@libav.org Bug-ID: 999
* | tools: Eliminate codec_type complexity from fuzzerMichael Niedermayer2017-04-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | libswscale/tests/swscale: Fix uninitialized variablesMichael Niedermayer2017-04-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avfilter/af_crystalizer: add support for more sample formatsPaul B Mahol2017-04-30
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/pthread_frame, decode: allow errors to happen on drainingMuhammad Faiz2017-04-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So, all frames and errors are correctly reported in order. Also limit the numbers of error during draining to prevent infinite loop. This fix fate failure with THREADS>=4: make fate-h264-attachment-631 THREADS=4 This also reverts a755b725ec1d657609c8bd726ce37e7cf193d03f. Suggested-by: wm4, Ronald S. Bultje, Marton Balint Reviewed-by: w4 <nfxjfg@googlemail.com> Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com> Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
* | avfilter: add video oscilloscope filterPaul B Mahol2017-04-29
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avfilter: add pixscope filterPaul B Mahol2017-04-29
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit 'e807491fc6a336e4becc0cbc981274a8fde18aba'Clément Bœsch2017-04-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e807491fc6a336e4becc0cbc981274a8fde18aba': mpeg12dec: avoid signed overflow in bitrate calculation mpegvideo_parser: avoid signed overflow in bitrate calculation This merge is a noop. 2017-04-29 12:54:15 @ubitux michaelni: is 740959fdbfbf804ccd8a6e426b1b1ba321fe5cfb enough to fix the overflow fixed in 58405de0951a843765625159402870c1eea3c3b1? 2017-04-29 12:55:53 @ubitux same question with e807491fc6a336e4becc0cbc981274a8fde18aba 2017-04-29 13:21:45 michaelni ubitux, the libav code refered to is wrong for us and i doubt the problem it fixes applies to us. 2017-04-29 13:24:29 @ubitux michaelni: ok, for both commits? 2017-04-29 13:33:55 michaelni yes, they do more or less the same thing Merged-by: Clément Bœsch <u@pkh.me>
| * mpeg12dec: avoid signed overflow in bitrate calculationAnton Khirnov2016-12-19
| | | | | | | | | | | | CC: libav-stable@libav.org Bug-Id: 981 Found-By: Agostino Sarubbo
| * mpegvideo_parser: avoid signed overflow in bitrate calculationAnton Khirnov2016-12-19
| | | | | | | | | | | | CC: libav-stable@libav.org Bug-Id: 981 Found-By: Agostino Sarubbo
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-29 13:11:05 +0000