Fixes out of array accesses
Fixes: asan_heap-oob_12304aa_8_asan_heap-oob_4da4f3_300_intro.jv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 105654e376a736d243aef4a1d121abebce912e6b)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Fixes out of array accesses
Fixes: asan_heap-oob_16668e9_2_asan_heap-oob_16668e9_346_miss_congeniality_pegasus_mjpg.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5c378d6a6df8243f06c87962b873bd563e58cd39)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
previously it could have been by 1 too large
Fixes out of array access
Fixes: asan_heap-oob_12240f5_1_asan_heap-oob_12240f5_448_t8c1e3.jls
Fixes: asan_heap-oob_12240f5_1_asan_heap-oob_12240f5_448_t8nde0.jls
Fixes: asan_heap-oob_12240fa_1_asan_heap-oob_12240fa_448_t16e3.jls
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 06e7d58410a17dc72c30ee7f3145fcacc425f4f2)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Found-by: Andreas Cadhalpun
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d85ebea3f3b68ebccfe308fa839fc30fa634e4de)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e58fc44649d07d523fcd17aa10d9eb0d3a5ef3f4)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ce6e46be72292a748f37af50bfd5001dc5daa0e7)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6d35aba167a2333367298fced3724b16261dcdf9)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 2497914a1846c1dbcfb853ea834da0038f0e22f5)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1dbdcb4a8c76df70ab41e3dacbfe01d59ed4091e)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Philip DeCamp <decamp@mit.edu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 857fc0a71f1b52fbba3281ba64b5a35195458622)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This may make fate failures where only the console output is available
easier to analyze
Suggested-by: Andreas Cadhalpun
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 00d3bb1a074b60fd9687679e4147f56d81886b05)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Fixes Ticket1304
Commit message and extradata size bugfix by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6843b9dc78bc966bb30121828ef4f6b6755cf877)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e5b3112996c3da45aa03b39c5ade375d40d4407d)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b0f7de3e7c735cf6e222006ecbbd3e11b5f90a21)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'ff24824a721576195c3b4a711e3ee2af900de795':
h264: reset ret to avoid propagating minor failures
See: 47048aa30b5c35fc8b030e819b9769b6bca03c08
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '9eb442cca23bb8d33b3e6d37b8c0e3afff04c37a':
Update default FATE URL for release/11
Conflicts:
tests/Makefile
no change, as we do not have per release reference samples
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Found-by: Kierank
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 61af6bebb457c8d9bb00baaccd65a39632437bcd)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
in the latest git commits of libilbc developers removed WebRtc_xxx typedefs
This commit uses int types instead,
it's safe to apply also for previous versions since
WebRtc_Word16 was always a typedef of int16_t and
WebRtc_UWord16 a typedef of uint16_t
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 59af5383c18c8cf3fe2a4b5cc1ebf2f3300bdfe5)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
See https://code.google.com/p/webp/issues/detail?id=206
for a description of the problem/fix.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This patch makes the decoder follow the recommendation of the spec.
There is some disagreement (see "[FFmpeg-devel] [PATCH]: libavcodec/webp")
about what would be best to be written in the spec, so in case the spec
is changed again, this potentially would need to be amended or reverted
(cherry picked from commit 4fd21d58a72c38ab63c3a4483b420db260fa7b8d)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
The token 'vector' is a keyword in the Vector/SIMD Multimedia Extension data types and thus should not be used as a variable name.
This fixes building on powerpc/ppc64el.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 739f179dd6a21f3fcbd3d23d3d14cde9bb587ead)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
The size variable is (correctly) unsigned, but is passed to several functions
which take signed parameters, such as avio_read, sometimes after having
numbers added to it. So ensure that size remains within the bounds that
these functions can handle.
(cherry picked from commit c5560e72d0bb69f8a1ac9536570398f84388f396)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Found-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4a99134f1a71994a0dc4542a0d6bee8e36146b60)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Fixes Ticket3883
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b227be34db76541db0269a769dad90c20793353f)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 808db3e68778b77e020aab1b838d32e63a38ae63)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
dst_file cannot be NULL
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 68bca03951b36755f46d75a5bcfcbba95ced21c4)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2.2 is used by 4 distributions, 2.3 by none, thus continuing maintaining
2.2 makes more sense than 2.3 see:
https://trac.ffmpeg.org/wiki/Downstreams
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit da2186be81b5cb2d24da5671e25affbb8f09920d)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'f851477889ae48e2f17073cf7486e1d5561b7ae4': (26 commits)
Prepare for 11 release
doc: Fix syntax and logical errors in avconv stream combination example
Fix RELEASE identification
Mark 11 release in the changelog
Add release notes for 11.
avcodec: fix missing doxygen comment marker
Prepare for 11_beta2 Release
license: Mention that vf_interlace is GPL, not LGPL
matroskaenc: convert avstream stereo3d side data during encoding
matroskadec: parse stereo mode on decoding
avcodec: add stream-level stereo3d side data
matroska: list supported extensions
doc/APIchanges: fill in missing hashes and dates
pulse: Add a wallclock option to be compatible with other other captures
vc1: Initialize start_code_found to 0
avconv: fix parsing the AVOptions for -target
avconv: fix the muxrate values for -target
mpegenc: limit the maximum muxrate
vc1: Fix the skip condition
vfwcap: Add fallback define for HWND_MESSAGE
...
Conflicts:
Changelog
LICENSE.md
RELEASE
doc/APIchanges
doc/RELEASE_NOTES
doc/ffmpeg.texi
ffmpeg_opt.c
libavcodec/avcodec.h
libavcodec/error_resilience.c
libavcodec/utils.c
libavcodec/vc1_parser.c
libavcodec/version.h
libavdevice/pulse_audio_dec.c
libavfilter/setpts.c
libavfilter/src_movie.c
libavformat/electronicarts.c
libavformat/matroska.c
libavformat/matroskadec.c
libavformat/matroskaenc.c
libavformat/mpegenc.c
Merge for metadata only, all these backports are already present in
release/2.4 as its branched off from master at a later point so that
all these changes where in master already.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
