summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* avcodec/mdec: Fix signed integer overflow: 28835400 * 83 cannot be ↵Michael Niedermayer2017-05-061-2/+2
| | | | | | | | | 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 <[email protected]>
* doc/libav_merge: remove line about ADVANCED_PARSERJames Almer2017-05-051-1/+0
| | | | | | | | It's been addressed. Reviewed-by: Hendrik Leppkes <[email protected]> Reviewed-by: Aaron Levinson <[email protected]> Signed-off-by: James Almer <[email protected]>
* avcodec/hevc_parse: decode SEI message NALUs in extradataJames Almer2017-05-055-15/+27
| | | | | | | | | | They may be available in hvcc style extradata. Based on a patch by Hendrik Leppkes. Reviewed-by: Hendrik Leppkes <[email protected]> Reviewed-by: Aaron Levinson <[email protected]> Signed-off-by: James Almer <[email protected]>
* avcodec/hevc_parser: move slice header parsing to its own functionJames Almer2017-05-051-107/+120
| | | | | | Reviewed-by: Hendrik Leppkes <[email protected]> Reviewed-by: Aaron Levinson <[email protected]> Signed-off-by: James Almer <[email protected]>
* avcodec/hevc_parser: remove HEVCContext usageJames Almer2017-05-052-146/+33
| | | | | | | | This gets rid of the duplicate, limited parser. Reviewed-by: Hendrik Leppkes <[email protected]> Reviewed-by: Aaron Levinson <[email protected]> Signed-off-by: James Almer <[email protected]>
* avcodec/hevc_parser: use ff_h2645_packet_split() to parse NAL unitsJames Almer2017-05-051-40/+10
| | | | | | | | This simplifies the code considerably. Reviewed-by: Hendrik Leppkes <[email protected]> Reviewed-by: Aaron Levinson <[email protected]> Signed-off-by: James Almer <[email protected]>
* avcodec/hevcdec: move SliceHeader struct definition to hevc_psJames Almer2017-05-052-83/+83
| | | | | | | | This is in preparation for a following patch. Reviewed-by: Hendrik Leppkes <[email protected]> Reviewed-by: Aaron Levinson <[email protected]> Signed-off-by: James Almer <[email protected]>
* avcodec/hevcdec: remove HEVCContext usage from ff_hevc_compute_poc()James Almer2017-05-056-30/+30
| | | | | | | | Move it to hevc_ps as well. This is in preparation for a following patch. Reviewed-by: Hendrik Leppkes <[email protected]> Reviewed-by: Aaron Levinson <[email protected]> Signed-off-by: James Almer <[email protected]>
* avcodec/hevcdec: move SEI message parsing into a separate headerJames Almer2017-05-053-103/+139
| | | | | | | | It doesn't depend on hevcdec anymore. Reviewed-by: Hendrik Leppkes <[email protected]> Reviewed-by: Aaron Levinson <[email protected]> Signed-off-by: James Almer <[email protected]>
* avcodec/hevcdec: remove HEVCContext usage from hevc_seiJames Almer2017-05-055-164/+177
| | | | | | | | Based on the H264 SEI implementation. Reviewed-by: Hendrik Leppkes <[email protected]> Reviewed-by: Aaron Levinson <[email protected]> Signed-off-by: James Almer <[email protected]>
* avcodec/dfa: Fix off by 1 errorMichael Niedermayer2017-05-051-1/+1
| | | | | | | | 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 <[email protected]>
* avcodec/nellymoser: Fix multiple left shift of negative value -8591Michael Niedermayer2017-05-051-2/+2
| | | | | | | 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 <[email protected]>
* avcodec/cdxl: Fix signed integer overflow: 14243456 * 164 cannot be ↵Michael Niedermayer2017-05-051-1/+1
| | | | | | | | | 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 <[email protected]>
* avcodec/g722: Fix multiple runtime error: left shift of negative value -1Michael Niedermayer2017-05-051-4/+4
| | | | | | | 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 <[email protected]>
* avcodec/dss_sp: Fix multiple left shift of negative value -466Michael Niedermayer2017-05-051-2/+2
| | | | | | | 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 <[email protected]>
* avcodec/wnv1: Fix runtime error: left shift of negative value -1Michael Niedermayer2017-05-051-1/+1
| | | | | | | 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 <[email protected]>
* Merge commit 'b68e353136db6f963212c457281d9716516cdc59'Clément Bœsch2017-05-052-4/+6
|\ | | | | | | | | | | | | * commit 'b68e353136db6f963212c457281d9716516cdc59': qsvdec: do not sync PIX_FMT_QSV surfaces Merged-by: Clément Bœsch <[email protected]>
| * qsvdec: do not sync PIX_FMT_QSV surfacesAnton Khirnov2017-01-122-4/+6
| | | | | | | | | | | | | | | | | | | | 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-050-0/+0
|\| | | | | | | | | | | | | | | | | * commit 'ac3c3ee678e51b05a2a7c30ce79465db46ba01fa': dxva2: allow an empty array of ID3D11VideoDecoderOutputView This commit is a noop, see 8fb48659018f17827c2d5a3ba72263f421fdfa2d Merged-by: Clément Bœsch <[email protected]>
| * dxva2: allow an empty array of ID3D11VideoDecoderOutputViewSteve Lhomme2017-01-122-3/+3
| | | | | | | | | | | | | | We can pick the correct slice index directly from the ID3D11VideoDecoderOutputView casted from data[3]. Signed-off-by: Anton Khirnov <[email protected]>
* | Merge commit 'f67235a28cef44fcd97ae74ad53bbbc0d7f63d60'Clément Bœsch2017-05-050-0/+0
|\| | | | | | | | | | | | | | | | | * 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 <[email protected]>
| * dxva2: get the slice number directly from the surface in D3D11VASteve Lhomme2017-01-121-7/+7
| | | | | | | | | | | | | | | | | | 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 <[email protected]>
* | Merge commit '122de16dd8108a59a55d30543c9f28b5f61b02d1'Clément Bœsch2017-05-058-45/+58
|\| | | | | | | | | | | | | * commit '122de16dd8108a59a55d30543c9f28b5f61b02d1': Replace cmdutils_common_opts.h by a macro Merged-by: Clément Bœsch <[email protected]>
| * Replace cmdutils_common_opts.h by a macroDiego Biurrun2017-01-126-23/+24
| |
* | Merge commit '2a2889e130fee6d3c11e506328388afb317626ed'Clément Bœsch2017-05-050-0/+0
|\| | | | | | | | | | | | | | | | | | | | | * 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 <[email protected]>
| * build: Remove stray duplicate conditional variable declarationDiego Biurrun2017-01-121-2/+0
| |
* | avcodec/aacps: Fix undefined behaviorMichael Niedermayer2017-05-051-1/+1
| | | | | | | | | | | | | | | | | | 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 <[email protected]>
* | avcodec/pixlet: Fix shift exponent 4294967268 is too large for 32-bit type 'int'Michael Niedermayer2017-05-051-2/+2
| | | | | | | | | | | | | | 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 <[email protected]>
* | avcodec/tiertexseqv: set the fixed dimenasions, do not depend on the demuxer ↵Michael Niedermayer2017-05-051-0/+5
| | | | | | | | | | | | | | | | | | | | 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 <[email protected]>
* | Merge commit '89725a8512721fffd190021ded2d3f5b42e20e2a'Clément Bœsch2017-05-050-0/+0
|\| | | | | | | | | | | | | | | | | * 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 <[email protected]>
| * vaapi_h264: Scale log2_max_pic_order_cnt_lsb with max_b_framesMark Thompson2017-01-111-0/+2
| | | | | | | | | | | | | | 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-050-0/+0
|\| | | | | | | | | | | | | | | | | * 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 <[email protected]>
| * vaapi_encode: Support forcing IDR frames via AVFrame.pict_typeMark Thompson2017-01-112-4/+24
| |
* | Merge commit '37fab0661a760b2a9d727939d72e629acee1a6ef'Clément Bœsch2017-05-050-0/+0
|\| | | | | | | | | | | | | | | | | * commit '37fab0661a760b2a9d727939d72e629acee1a6ef': vaapi_encode: Fix GOP sizing This commit is a noop, see 760f1a7727583e07efb1d4b0d8e28a1dd2c54a93 Merged-by: Clément Bœsch <[email protected]>
| * vaapi_encode: Fix GOP sizingMark Thompson2017-01-112-46/+36
| | | | | | | | | | | | 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-050-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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 <[email protected]>
| * interplayvideo: Convert to the new bitstream readerAlexandra Hájková2017-01-091-4/+4
| |
| * adx: Convert to the new bitstream readerAlexandra Hájková2017-01-091-4/+5
| |
| * dvbsubdec: Convert to the new bitstream readerAlexandra Hájková2017-01-091-34/+34
| |
| * motionpixels: Convert to the new bitstream readerAlexandra Hájková2017-01-091-37/+40
| |
* | Merge commit '00b6a765430e5c5cacf0bd1be8b318d631cd4e14'Clément Bœsch2017-05-051-16/+27
|\| | | | | | | | | | | | | * commit '00b6a765430e5c5cacf0bd1be8b318d631cd4e14': hmac: Explicitly convert types at function pointer assignment Merged-by: Clément Bœsch <[email protected]>
| * hmac: Explicitly convert types at function pointer assignmentDiego Biurrun2017-01-091-12/+23
| | | | | | | | | | Fixes a number of warnings of the type libavutil/hmac.c:61:21: warning: assignment from incompatible pointer type
* | lavu/sha512: update length argument following sha+md5 changesClément Bœsch2017-05-053-1/+10
| |
* | Merge commit 'e435beb1ea5380a90774dbf51fdc8c941e486551'Clément Bœsch2017-05-056-3/+36
|\| | | | | | | | | | | | | * commit 'e435beb1ea5380a90774dbf51fdc8c941e486551': crypto: consistently use size_t as type for length parameters Merged-by: Clément Bœsch <[email protected]>
| * crypto: consistently use size_t as type for length parametersDiego Biurrun2017-01-096-4/+34
| | | | | | | | size_t is the correct type to use for sizes.
* | Merge commit 'f1af37b51033ad90e56a8d7dfcc366f2bd9d2fed'Clément Bœsch2017-05-052-4/+3
|\| | | | | | | | | | | | | * commit 'f1af37b51033ad90e56a8d7dfcc366f2bd9d2fed': h264dec: make ff_h264_decode_init() static Merged-by: Clément Bœsch <[email protected]>
| * h264dec: make ff_h264_decode_init() staticAnton Khirnov2017-01-092-3/+2
| | | | | | | | It is not called from outside h264dec.c anymore.
* | Merge commit 'e7de05f98f630b5b3a5e441c8fa763e6d89b8851'Clément Bœsch2017-05-050-0/+0
|\| | | | | | | | | | | | | | | | | * commit 'e7de05f98f630b5b3a5e441c8fa763e6d89b8851': h264dec: drop a redundant check This commit is a noop, see 4cc1ce4a91788a71670ea43fa0026b5a969e9e9e Merged-by: Clément Bœsch <[email protected]>
| * h264dec: drop a redundant checkAnton Khirnov2017-01-091-17/+0
| | | | | | | | | | Cropping parameters are already checked for validity during SPS parsing, no need to check them again.
* | Merge commit '3cba1ad76d362c994fa98fb686e04e20826fb579'Clément Bœsch2017-05-050-0/+0
|\| | | | | | | | | | | | | | | | | * commit '3cba1ad76d362c994fa98fb686e04e20826fb579': x86inc: Avoid using eax/rax for storing the stack pointer This commit is a noop, see cd09e3b34903db7b7e37fdb4d3e10549bf8b2e82 Merged-by: Clément Bœsch <[email protected]>