summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* avcodec/cavsdec: Fix undefined behavior from integer overflowMichael Niedermayer2017-05-05
| | | | | | | Fixes: 1335/clusterfuzz-testcase-minimized-5566961566089216 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/dvdsubdec: Fix runtime error: left shift of 242 by 24 places cannot ↵Michael Niedermayer2017-05-05
| | | | | | | | | be represented in type 'int' Fixes: 1080/clusterfuzz-testcase-5353236754071552 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit '8a34f3659371680ca523aecfd9098c28f0f809eb'James Almer2017-05-04
|\ | | | | | | | | | | | | | | | | * commit '8a34f3659371680ca523aecfd9098c28f0f809eb': build: Add version numbers to "Requires" entries in pkg-config files This commit is a noop, see 6fdd35a3126f6ecbe4ebab12bdf8867e4f544958 Merged-by: James Almer <jamrial@gmail.com>
| * build: Add version numbers to "Requires" entries in pkg-config filesDiego Biurrun2016-12-28
| | | | | | | | The (required) version numbers disappeared after edb4348732.
* | avcodec/vorbisdec: add missing commaJames Almer2017-05-04
| | | | | | | | | | | | Should fix compilation failures after 191b2d4fc96fa87975a8eb5d87db04516b8a04c3. Found-by: philipl
* | Merge commit '53618054b64ce4dab459d23a7efebe9d5afc4855'James Almer2017-05-04
|\| | | | | | | | | | | | | * commit '53618054b64ce4dab459d23a7efebe9d5afc4855': parser: Add missing #include for printing ISO C99 conversion specifiers Merged-by: James Almer <jamrial@gmail.com>
| * parser: Add missing #include for printing ISO C99 conversion specifiersDiego Biurrun2016-12-25
| |
* | Merge commit '0982152c3fb05365597978c5d7cfeeb7ced01723'James Almer2017-05-04
|\| | | | | | | | | | | | | | | | | * commit '0982152c3fb05365597978c5d7cfeeb7ced01723': matroskadec: fix SRT subtitle duration This commit is a noop. Merged-by: James Almer <jamrial@gmail.com>
| * matroskadec: fix SRT subtitle durationJohn Stebbins2016-12-24
| | | | | | | | The codec id for SRT was changed and conditionals were not updated.
* | Merge commit '131644677970a3c4a0096270ea2a5b5d437c2e63'James Almer2017-05-04
|\| | | | | | | | | | | | | | | | | * commit '131644677970a3c4a0096270ea2a5b5d437c2e63': http: Check for negative chunk sizes This commit is a noop, see 2a05c8f813de6f2278827734bf8102291e7484aa Merged-by: James Almer <jamrial@gmail.com>
| * http: Check for negative chunk sizesMartin Storsjö2016-12-23
| | | | | | | | | | | | | | | | | | | | | | A negative chunk size is illegal and would end up used as length for memcpy, where it would lead to memory accesses out of bounds. Found-by: Paul Cher <paulcher@icloud.com> CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '0b77a5933635293508e7289e7cf191ed166cf070'James Almer2017-05-04
|\| | | | | | | | | | | | | | | | | * commit '0b77a5933635293508e7289e7cf191ed166cf070': Use correct printf conversion specifiers for POSIX integer types See 549045254c4614d5d61b5c36e340171a6914d57c Merged-by: James Almer <jamrial@gmail.com>
| * Use correct printf conversion specifiers for POSIX integer typesDiego Biurrun2016-12-23
| |
* | Merge commit '92db5083077a8b0f8e1050507671b456fd155125'James Almer2017-05-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '92db5083077a8b0f8e1050507671b456fd155125': build: Generate pkg-config files from Make and not from configure build: Store library version numbers in .version files Includes cherry-picked commits 8a34f3659371680ca523aecfd9098c28f0f809eb and ee164727dd64c199b87118917e674b17c25e0da3 to fix issues. Changes were also made to retain support for raise_major and build_suffix. Reviewed-by: ubitux Merged-by: James Almer <jamrial@gmail.com>
| * build: Generate pkg-config files from Make and not from configureDiego Biurrun2016-12-22
| | | | | | | | | | | | | | | | This moves work from the configure to the Make stage where it can be parallelized and ensures that pkgconfig files are updated when library versions change. Bug-Id: 449
| * build: Store library version numbers in .version filesDiego Biurrun2016-12-22
| | | | | | | | | | | | This moves work from the configure to the Make stage where it can be parallelized and ensures that shared libraries are built with the right version number in the filename.
* | cuvid: support AVCodecContext.hw_device_ctx APIwm42017-05-05
| | | | | | | | | | | | | | | | | | | | | | This is a newer API that is intended for decoders like the cuvid wrapper. Until now, the wrapper required to set an awkward "incomplete" hw_frames_ctx to set the device. Now the device can be set directly, and the user can get AV_PIX_FMT_CUDA output for a specific device simply by setting hw_device_ctx. This still does a dummy ff_get_format() call at init time, and should be fully backward compatible.
* | ffmpeg: check for unconnected outputswm42017-05-05
| | | | | | | | | | | | Fixes e.g.: ffmpeg -f lavfi -i testsrc -f lavfi -i testsrc -filter_complex "[0:v][1:v]psnr[out]" -f null none
* | compat/strtod: Add missing const qualifiers.Carl Eugen Hoyos2017-05-04
| | | | | | | | | | Fixes many warnings: initialization discards 'const' qualifier from pointer target type
* | avcodec/mjpegdec: Fix runtime error: signed integer overflow: -24543 * ↵Michael Niedermayer2017-05-04
| | | | | | | | | | | | | | | | | | 2031616 cannot be represented in type 'int' Fixes: 943/clusterfuzz-testcase-5114865297391616 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/wavpack: Fix invalid shift and integer overflowMichael Niedermayer2017-05-04
| | | | | | | | | | | | | | Fixes: 940/clusterfuzz-testcase-5200378381467648 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/flicvideo: Check for chunk overreadMichael Niedermayer2017-05-04
| | | | | | | | | | | | | | Fixes integer overflow Fixes: 1292/clusterfuzz-testcase-minimized-5795512143839232 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | libavcodec/mpeg4videodec: Convert sprite_offset to 64bitMichael Niedermayer2017-05-04
| | | | | | | | | | | | | | | | | | | | This avoids intermediates from overflowing (the final values are checked) Fixes: runtime error: signed integer overflow: -167712 + -2147352576 cannot be represented in type 'int' Fixes: 1298/clusterfuzz-testcase-minimized-5955580877340672 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/pngdec: Use ff_set_dimensions()Michael Niedermayer2017-05-04
| | | | | | | | | | | | | | | | Fixes OOM Fixes: 1314/clusterfuzz-testcase-minimized-4621997222920192 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/msvideo1: Check buffer size before re-getting the frameMichael Niedermayer2017-05-04
| | | | | | | | | | | | | | | | Fixes timeout Fixes: 1306/clusterfuzz-testcase-minimized-6152296217968640 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | configure: Do not add omit-frame-pointer for ossfuzzMichael Niedermayer2017-05-04
| | | | | | | | | | | | ossfuzz works better without it Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | tools/target_dec_fuzzer: Fix memleak on open failureMichael Niedermayer2017-05-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | configure: fix libopus detectionJames Almer2017-05-04
| | | | | | | | | | Prevents compilation failures on libopus < 1.0.3 Regression since 37941878.
* | avformat/concatdec: port to the new bitstream filter APIJames Almer2017-05-03
| | | | | | | | | | | | Reviewed-by: wm4 <nfxjfg@googlemail.com> Reviewed-by: Aaron Levinson <alevinsn@aracnet.com> Signed-off-by: James Almer <jamrial@gmail.com>
* | tools/target_dec_fuzzer: Use decoder and not codec_id as argumentMichael Niedermayer2017-05-03
| | | | | | | | | | | | | | This allows fuzzing decoders with the same codec_id We also avoid register all to allow the linker to prune unused sections and symbols Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | 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>