summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* avcodec/opus_silk: Fix integer overflow and out of array readMichael Niedermayer2017-05-06
| | | | | | | Fixes: 1362/clusterfuzz-testcase-minimized-6097275002552320 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/clearvideo: Fix multiple runtime error: left shift of negative value ↵Michael Niedermayer2017-05-06
| | | | | | | | | -1024 Fixes: 1360/clusterfuzz-testcase-minimized-5606472043986944 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/fic: Fix multiple left shift of negative value -15Michael Niedermayer2017-05-06
| | | | | | | Fixes: 1356/clusterfuzz-testcase-minimized-6008489086287872 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/mlpdec: Fix runtime error: left shift of negative value -22Michael Niedermayer2017-05-06
| | | | | | | Fixes: 1355/clusterfuzz-testcase-minimized-6662205472768000 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec: Avoid splitting side data repeatedlyMichael Niedermayer2017-05-06
| | | | | | | | Fixes Timeout Fixes: 508/clusterfuzz-testcase-6245747678773248 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/snowdec: Check qbiasMichael Niedermayer2017-05-06
| | | | | | | | Fixes: signed integer overflow: -1094995529 * 131 cannot be represented in type 'int' Fixes: 1353/clusterfuzz-testcase-minimized-5208180449607680 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/hevc_parser: cosmeticsJames Almer2017-05-05
| | | | | | Reduces differences with libav slightly. Signed-off-by: James Almer <jamrial@gmail.com>
* avcodec/hevc_parser: move hevc_find_frame_end() down in the fileJames Almer2017-05-05
| | | | Reduces differences with libav.
* avutil/softfloat: Fix multiple runtime error: left shift of negative value -8Michael Niedermayer2017-05-06
| | | | | | | Fixes: 1352/clusterfuzz-testcase-minimized-5757565017260032 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/ivi: Free custom blk_vlcMichael Niedermayer2017-05-06
| | | | | | | | Fixes memleak Fixes: 1351/clusterfuzz-testcase-minimized-5861971645693952 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/aacsbr_template: Do not leave bs_num_env invalidMichael Niedermayer2017-05-06
| | | | | | | | Fixes out of array read Fixes: 1349/clusterfuzz-testcase-minimized-5370707196248064 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/mdec: Fix signed integer overflow: 28835400 * 83 cannot be ↵Michael Niedermayer2017-05-06
| | | | | | | | | represented in type 'int' Fixes: 1346/clusterfuzz-testcase-minimized-5776732600664064 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* doc/libav_merge: remove line about ADVANCED_PARSERJames Almer2017-05-05
| | | | | | | | It's been addressed. Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com> Reviewed-by: Aaron Levinson <alevinsn@aracnet.com> Signed-off-by: James Almer <jamrial@gmail.com>
* avcodec/hevc_parse: decode SEI message NALUs in extradataJames Almer2017-05-05
| | | | | | | | | | They may be available in hvcc style extradata. Based on a patch by Hendrik Leppkes. Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com> Reviewed-by: Aaron Levinson <alevinsn@aracnet.com> Signed-off-by: James Almer <jamrial@gmail.com>
* avcodec/hevc_parser: move slice header parsing to its own functionJames Almer2017-05-05
| | | | | | Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com> Reviewed-by: Aaron Levinson <alevinsn@aracnet.com> Signed-off-by: James Almer <jamrial@gmail.com>
* avcodec/hevc_parser: remove HEVCContext usageJames Almer2017-05-05
| | | | | | | | This gets rid of the duplicate, limited parser. Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com> Reviewed-by: Aaron Levinson <alevinsn@aracnet.com> Signed-off-by: James Almer <jamrial@gmail.com>
* avcodec/hevc_parser: use ff_h2645_packet_split() to parse NAL unitsJames Almer2017-05-05
| | | | | | | | This simplifies the code considerably. Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com> Reviewed-by: Aaron Levinson <alevinsn@aracnet.com> Signed-off-by: James Almer <jamrial@gmail.com>
* avcodec/hevcdec: move SliceHeader struct definition to hevc_psJames Almer2017-05-05
| | | | | | | | This is in preparation for a following patch. Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com> Reviewed-by: Aaron Levinson <alevinsn@aracnet.com> Signed-off-by: James Almer <jamrial@gmail.com>
* avcodec/hevcdec: remove HEVCContext usage from ff_hevc_compute_poc()James Almer2017-05-05
| | | | | | | | Move it to hevc_ps as well. This is in preparation for a following patch. Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com> Reviewed-by: Aaron Levinson <alevinsn@aracnet.com> Signed-off-by: James Almer <jamrial@gmail.com>
* avcodec/hevcdec: move SEI message parsing into a separate headerJames Almer2017-05-05
| | | | | | | | It doesn't depend on hevcdec anymore. Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com> Reviewed-by: Aaron Levinson <alevinsn@aracnet.com> Signed-off-by: James Almer <jamrial@gmail.com>
* avcodec/hevcdec: remove HEVCContext usage from hevc_seiJames Almer2017-05-05
| | | | | | | | Based on the H264 SEI implementation. Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com> Reviewed-by: Aaron Levinson <alevinsn@aracnet.com> Signed-off-by: James Almer <jamrial@gmail.com>
* avcodec/dfa: Fix off by 1 errorMichael Niedermayer2017-05-05
| | | | | | | | Fixes out of array access Fixes: 1345/clusterfuzz-testcase-minimized-6062963045695488 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/nellymoser: Fix multiple left shift of negative value -8591Michael Niedermayer2017-05-05
| | | | | | | Fixes: 1342/clusterfuzz-testcase-minimized-5490842129137664 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/cdxl: Fix signed integer overflow: 14243456 * 164 cannot be ↵Michael Niedermayer2017-05-05
| | | | | | | | | represented in type 'int' Fixes: 1341/clusterfuzz-testcase-minimized-5441502618583040 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/g722: Fix multiple runtime error: left shift of negative value -1Michael Niedermayer2017-05-05
| | | | | | | Fixes: 1340/clusterfuzz-testcase-minimized-4669892148068352 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/dss_sp: Fix multiple left shift of negative value -466Michael Niedermayer2017-05-05
| | | | | | | Fixes: 1339/clusterfuzz-testcase-minimized-4614671485108224 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/wnv1: Fix runtime error: left shift of negative value -1Michael Niedermayer2017-05-05
| | | | | | | Fixes: 1338/clusterfuzz-testcase-minimized-6485546354343936 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 'b68e353136db6f963212c457281d9716516cdc59'Clément Bœsch2017-05-05
|\ | | | | | | | | | | | | * commit 'b68e353136db6f963212c457281d9716516cdc59': qsvdec: do not sync PIX_FMT_QSV surfaces Merged-by: Clément Bœsch <cboesch@gopro.com>
| * qsvdec: do not sync PIX_FMT_QSV surfacesAnton Khirnov2017-01-12
| | | | | | | | | | | | | | | | | | | | Introducing enforced sync points in arbitrary places is bad for performance. Since the vast majority of receiving code (QSV VPP or encoders, retrieving frames through hwcontext) will do the syncing, this change should not be visible to most callers. But bumping micro just in case. This is also consistent with what VAAPI hwaccel does.
* | Merge commit 'ac3c3ee678e51b05a2a7c30ce79465db46ba01fa'Clément Bœsch2017-05-05
|\| | | | | | | | | | | | | | | | | * commit 'ac3c3ee678e51b05a2a7c30ce79465db46ba01fa': dxva2: allow an empty array of ID3D11VideoDecoderOutputView This commit is a noop, see 8fb48659018f17827c2d5a3ba72263f421fdfa2d Merged-by: Clément Bœsch <cboesch@gopro.com>
| * dxva2: allow an empty array of ID3D11VideoDecoderOutputViewSteve Lhomme2017-01-12
| | | | | | | | | | | | | | We can pick the correct slice index directly from the ID3D11VideoDecoderOutputView casted from data[3]. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'f67235a28cef44fcd97ae74ad53bbbc0d7f63d60'Clément Bœsch2017-05-05
|\| | | | | | | | | | | | | | | | | * commit 'f67235a28cef44fcd97ae74ad53bbbc0d7f63d60': dxva2: get the slice number directly from the surface in D3D11VA This commit is a noop, see 153b36fc62849e0e1540a43829794e0503994ebb Merged-by: Clément Bœsch <cboesch@gopro.com>
| * dxva2: get the slice number directly from the surface in D3D11VASteve Lhomme2017-01-12
| | | | | | | | | | | | | | | | | | No need to loop through the known surfaces, we'll use the requested surface anyway. The loop is only done for DXVA2. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '122de16dd8108a59a55d30543c9f28b5f61b02d1'Clément Bœsch2017-05-05
|\| | | | | | | | | | | | | * commit '122de16dd8108a59a55d30543c9f28b5f61b02d1': Replace cmdutils_common_opts.h by a macro Merged-by: Clément Bœsch <cboesch@gopro.com>
| * Replace cmdutils_common_opts.h by a macroDiego Biurrun2017-01-12
| |
* | Merge commit '2a2889e130fee6d3c11e506328388afb317626ed'Clément Bœsch2017-05-05
|\| | | | | | | | | | | | | | | | | | | | | * commit '2a2889e130fee6d3c11e506328388afb317626ed': build: Remove stray duplicate conditional variable declaration This commit is a noop, there is no duplicate in FFmpeg. we have the tools rules kept in the root Makefile though (see 802d94c36edcd05b53a56ee359d9559cc4e11597) Merged-by: Clément Bœsch <cboesch@gopro.com>
| * build: Remove stray duplicate conditional variable declarationDiego Biurrun2017-01-12
| |
* | avcodec/aacps: Fix undefined behaviorMichael Niedermayer2017-05-05
| | | | | | | | | | | | | | | | | | Fixes: 1337/clusterfuzz-testcase-minimized-5212314171080704 Fixes the existence of a potentially invalid pointer intermediate Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/pixlet: Fix shift exponent 4294967268 is too large for 32-bit type 'int'Michael Niedermayer2017-05-05
| | | | | | | | | | | | | | Fixes: 1336/clusterfuzz-testcase-minimized-4761381930795008 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/tiertexseqv: set the fixed dimenasions, do not depend on the demuxer ↵Michael Niedermayer2017-05-05
| | | | | | | | | | | | | | | | | | | | doing so Fixes: out of array access Fixes: 1348/clusterfuzz-testcase-minimized-6195673642827776 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 '89725a8512721fffd190021ded2d3f5b42e20e2a'Clément Bœsch2017-05-05
|\| | | | | | | | | | | | | | | | | * commit '89725a8512721fffd190021ded2d3f5b42e20e2a': vaapi_h264: Scale log2_max_pic_order_cnt_lsb with max_b_frames This commit is a noop, see eefa4b76ee5a1059a36d8bd77b123c2cfbfea604 Merged-by: Clément Bœsch <cboesch@gopro.com>
| * vaapi_h264: Scale log2_max_pic_order_cnt_lsb with max_b_framesMark Thompson2017-01-11
| | | | | | | | | | | | | | Before this change, it was possible to overflow pic_order_cnt_lsb and generate a stream with invalid POC numbering. This makes sure that the field is large enough that a single IDR B* P sequence uses fewer than half the available POC lsb values.
* | Merge commit 'a3c3a5eac20a51d402c332cdf5220fff40a7943f'Clément Bœsch2017-05-05
|\| | | | | | | | | | | | | | | | | * commit 'a3c3a5eac20a51d402c332cdf5220fff40a7943f': vaapi_encode: Support forcing IDR frames via AVFrame.pict_type This commit is a noop, see c667c0979cbc2e04d1d00964b82ac49746caa43c Merged-by: Clément Bœsch <cboesch@gopro.com>
| * vaapi_encode: Support forcing IDR frames via AVFrame.pict_typeMark Thompson2017-01-11
| |
* | Merge commit '37fab0661a760b2a9d727939d72e629acee1a6ef'Clément Bœsch2017-05-05
|\| | | | | | | | | | | | | | | | | * commit '37fab0661a760b2a9d727939d72e629acee1a6ef': vaapi_encode: Fix GOP sizing This commit is a noop, see 760f1a7727583e07efb1d4b0d8e28a1dd2c54a93 Merged-by: Clément Bœsch <cboesch@gopro.com>
| * vaapi_encode: Fix GOP sizingMark Thompson2017-01-11
| | | | | | | | | | | | This change makes the configured GOP size be respected exactly - previously the value could be exceeded slightly due to flaws in the frame type selection logic.
* | Merge commit 'bd6496fa07e32fd09ceb79404f9af43df959bcb2'Clément Bœsch2017-05-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bd6496fa07e32fd09ceb79404f9af43df959bcb2': interplayvideo: Convert to the new bitstream reader adx: Convert to the new bitstream reader dvbsubdec: Convert to the new bitstream reader motionpixels: 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>
| * interplayvideo: Convert to the new bitstream readerAlexandra Hájková2017-01-09
| |
| * adx: Convert to the new bitstream readerAlexandra Hájková2017-01-09
| |
| * dvbsubdec: Convert to the new bitstream readerAlexandra Hájková2017-01-09
| |