* 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
802d94c36e)
Merged-by: Clément Bœsch <cboesch@gopro.com>
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>
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>
* commit '89725a8512721fffd190021ded2d3f5b42e20e2a':
vaapi_h264: Scale log2_max_pic_order_cnt_lsb with max_b_frames
This commit is a noop, see eefa4b76ee
Merged-by: Clément Bœsch <cboesch@gopro.com>
* commit 'a3c3a5eac20a51d402c332cdf5220fff40a7943f':
vaapi_encode: Support forcing IDR frames via AVFrame.pict_type
This commit is a noop, see c667c0979c
Merged-by: Clément Bœsch <cboesch@gopro.com>
* commit '37fab0661a760b2a9d727939d72e629acee1a6ef':
vaapi_encode: Fix GOP sizing
This commit is a noop, see 760f1a7727
Merged-by: Clément Bœsch <cboesch@gopro.com>
* 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>
* commit 'e435beb1ea5380a90774dbf51fdc8c941e486551':
crypto: consistently use size_t as type for length parameters
Merged-by: Clément Bœsch <cboesch@gopro.com>
* commit 'e7de05f98f630b5b3a5e441c8fa763e6d89b8851':
h264dec: drop a redundant check
This commit is a noop, see 4cc1ce4a91
Merged-by: Clément Bœsch <cboesch@gopro.com>
* commit '3cba1ad76d362c994fa98fb686e04e20826fb579':
x86inc: Avoid using eax/rax for storing the stack pointer
This commit is a noop, see cd09e3b349
Merged-by: Clément Bœsch <cboesch@gopro.com>
* commit '4e62b57ee03928c12a3119dcaf78ffa1f4d6985f':
fate: Skip the checkasm test if CONFIG_STATIC is disabled
Merged-by: Clément Bœsch <cboesch@gopro.com>
* commit '2835e9a9fd2b355e7936d1024ff1bf5fe454e428':
hevcdec: add P010 support for D3D11VA
This commit is a noop, see ccb94789e2
Merged-by: Clément Bœsch <cboesch@gopro.com>
* commit '0ac2d86c4758e1419934905b6c092910296aa16a':
dxva2: Factorize DXVA context validity test into a single macro
This commit is (mostly) a noop, see 77742c75c5
Merged-by: Clément Bœsch <cboesch@gopro.com>
* commit 'f8a42d4f260db3eae4399fa8bd8c8c2c1d38f23a':
dxva2: Make ff_dxva2_get_surface() static and drop its name prefix
This commit is a noop, see fd0716b364
Merged-by: Clément Bœsch <cboesch@gopro.com>
* commit '9026ec8aaf5fa19cb4fb266c16f608af0d863b2b':
matroskadec: make sure not to leave EbmlBin in an inconsistent state
This commit is a noop, see 5e1bacf2d4
Merged-by: Clément Bœsch <cboesch@gopro.com>
* commit '9b1db2d33883c6ff3f8c7b2453146501ba14ca20':
vaapi_h264: Fix POC on IDR frames
This commit is a noop, see e72662e131
Merged-by: Clément Bœsch <cboesch@gopro.com>
* commit 'd08e02d929ff8be5f56bb1da0e439bf1ae557552':
vaapi_h265: Fix build failure with old libva without 10-bit surfaces
This commit is a noop, see b9514756ba
Merged-by: Clément Bœsch <cboesch@gopro.com>
* commit '85ad5ea72ce3983947a3b07e4b35c66cb16dfaba':
aarch64: vp9mc: Fix a comment to refer to a register with the right name
This commit is a noop, see 0ba0187535
Merged-by: Clément Bœsch <cboesch@gopro.com>
* commit '65074791e8f8397600aacc9801efdd17777eb6e3':
aarch64: vp9dsp: Fix vertical alignment in the init file
This commit is a noop, see 02cfb9a16e
Merged-by: Clément Bœsch <cboesch@gopro.com>
* commit 'c536e5e8698110c139b1c17938998a5547550aa3':
arm: vp9mc: Fix vertical alignment of operands
This commit is a noop, see 656d910981
Merged-by: Clément Bœsch <cboesch@gopro.com>
* commit 'd31f46e1999fab31be46f0cbce0546a5aa49fe48':
cmdutils: update copyright year to 2017
This commit is a noop, see d800d48fc6
Merged-by: Clément Bœsch <cboesch@gopro.com>
* commit 'ee164727dd64c199b87118917e674b17c25e0da3':
configure: Fix typo in incdir variable written to config.sh
This commit is a noop, see 6fdd35a312
Merged-by: Clément Bœsch <cboesch@gopro.com>
* commit '5c83b4d550ea42653fece092987bab56ccc32ead':
fate: Unset the sig variable if ignoring a test failure
Merged-by: Clément Bœsch <cboesch@gopro.com>
Fixes the following warning:
libavutil/timecode.c:103:60: warning: '%02d' directive output may be truncated writing between 2 and 10 bytes into a region of size between 0 and 7
* commit '8a34f3659371680ca523aecfd9098c28f0f809eb':
build: Add version numbers to "Requires" entries in pkg-config files
This commit is a noop, see 6fdd35a312
Merged-by: James Almer <jamrial@gmail.com>
* commit '0982152c3fb05365597978c5d7cfeeb7ced01723':
matroskadec: fix SRT subtitle duration
This commit is a noop.
Merged-by: James Almer <jamrial@gmail.com>
* commit '131644677970a3c4a0096270ea2a5b5d437c2e63':
http: Check for negative chunk sizes
This commit is a noop, see 2a05c8f813
Merged-by: James Almer <jamrial@gmail.com>
* commit '0b77a5933635293508e7289e7cf191ed166cf070':
Use correct printf conversion specifiers for POSIX integer types
See 549045254c
Merged-by: James Almer <jamrial@gmail.com>
* 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 8a34f36593 and
ee164727dd 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>
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.
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>
