* commit '2bbb5abd877104fa9bc342c521bb49bc1aad50ce':
build: Map -Wall compiler flag to -W3 for MSVC and -Wextra to -W4
Merged-by: Clément Bœsch <u@pkh.me>
* commit '6151e9128ce2a84a443c82b78f5b5cb364ba2ab4':
build: Detect blocks C language extension and add it as VDA dependency
Merged-by: Clément Bœsch <u@pkh.me>
Some samples have their metadata track time_scale incorrectly set to 0
and the check introduced by a398f054fd
prevents playback of those samples. Setting the time_scale to 1 fixes
playback.
Add dxva2_pool_release_dummy() and use it in call to
av_buffer_create() in dxva2_pool_alloc().
Prior to this change, av_buffer_create() was called with NULL for the
third argument, which indicates that av_buffer_default_free() should
be used to free the buffer's data. Eventually, it gets to
buffer_pool_free() and calls buf->free() on a surface object (which is
av_buffer_default_free()).
This can result in a crash when the debug version of the C-runtime is
used on Windows. While it doesn't appear to result in a crash when
the release version of the C-runtime is used on Windows, it likely
results in memory corruption, since av_free() is being called on
memory that was allocated using
IDirectXVideoAccelerationService::CreateSurface().
Signed-off-by: Aaron Levinson <alevinsn@aracnet.com>
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Reviewed-by: Steven Liu <lingjiujianke@gmail.com>
Reviewed-by: Mark Thompson <sw@jkqxz.net>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
HEVCSEIPictureHash should store only the information extracted from the
bitstream and exported to the higher layer (the decoder or the parser).
The MD5 context is allocated, used and freed by this higher layer, so it
makes more sense for it to also be stored there.
This mimics the behavior of the now unused h264/hevc parser's split()
function and fixes decoding some files when extract_extradata bsf is
enabled.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Fixes: runtime error: index 8 out of bounds for type 'uint8_t [8]'
Fixes: 1699/clusterfuzz-testcase-minimized-6327177438035968
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
See http://lists.ffmpeg.org/pipermail/ffmpeg-user/2017-April/035975.html
Parsed_filter_X could remain and user can override it with custom one.
Example:
ffplay -f lavfi "nullsrc=s=640x360,
sendcmd='1 drawtext@top reinit text=Hello; 2 drawtext@bottom reinit text=World',
drawtext@top=x=16:y=16:fontsize=20:fontcolor=Red:text='',
drawtext@bottom=x=16:y=340:fontsize=16:fontcolor=Blue:text=''"
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
* commit '562ef82d6a7f96f6b9da1219a5aaf7d9d7056f1b':
fifo: Return the correct AVERROR value
This commit is a noop, see 2e81bb5e92
Merged-by: Clément Bœsch <u@pkh.me>
* commit '381a4e31a6b801a046e38b0e2b08fb61499157a7':
tak: Convert to the new bitstream reader
magicyuv: Convert to the new bitstream reader
truemotion2rt: Convert to the new bitstream reader
wavpack: Convert to the new bitstream reader
mpc: 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 '5c0e2b13eb79b455b15355d64f7993b0f66ea9ec':
swscale-test: const correctness for pointer variable
This commit is a noop, see b36745339d
Merged-by: Clément Bœsch <u@pkh.me>
* commit 'fd8de7f2d8c31195d309247cb129c0ad787ef76e':
dxtory: Convert to the new bitstream reader
apedec: Convert to the new bitstream reader
This commit is a noop, see
http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html
Merged-by: Clément Bœsch <u@pkh.me>
* commit '00b775dda2b3f78ae60ff3278d3b3d6545883a83':
hevc: Mark as having threadsafe init
This commit is a noop, see 14b9060160
Merged-by: Clément Bœsch <u@pkh.me>
* commit 'fb59f87ce72035b940c3f5045884098b9324e1b2':
nvenc: Explicitly push the cuda context on encoding
This commit is a noop, see be74ba648c
Merged-by: Clément Bœsch <u@pkh.me>
* commit '4795e4f61f993940c5384044caff56cc15078698':
alac: Convert to the new bitstream reader
rtp: Convert to the new bitstream reader
mov: 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 '44129e38047b6a27291e487c2084894958c6f399':
avconv: Do not pass NULL to avio_tell
This commit is a noop. The FFmpeg code handle cases where total_size is
an AVERROR (which avio_tell(NULL) will return) later in the function.
Note: the original commit refers to the null *muxer*. `ffmpeg -lavfi
testsrc -f null -` can be used as a test case.
Merged-by: Clément Bœsch <u@pkh.me>
It's not used by anything, has dubious usefulness, the reasons for which
it was introduced are no longer valid, and only serves to add complexity
to the build system.
Signed-off-by: James Almer <jamrial@gmail.com>
* commit 'f8f7ad758d0e1f36915467567f4d75541d98c12f':
qsv: Set the correct range for la_depth
This commit is a noop. There is a separate parameter to enable
lookahead, so overloading the depth is unnecessary.
Merged-by: Mark Thompson <sw@jkqxz.net>
Fixes: runtime error: shift exponent 1073741824 is too large for 32-bit type 'int'
Fixes: 1654/clusterfuzz-testcase-minimized-5151903795118080
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Clément Bœsch
Matthieu Bouron
Paul B Mahol
Aaron Levinson
Anton Khirnov
James Almer
Michael Niedermayer
Muhammad Faiz
Mark Thompson