* commit '58d87e0f49bcbbc6f426328f53b657bae7430cd2':
aarch64: vp9itxfm: Restructure the idct32 store macros
arm: vp9itxfm: Avoid .irp when it doesn't save any lines
This commit is a noop, see
31e41350d252c7366c83
Merged-by: James Almer <jamrial@gmail.com>
This reverts commit 740e557d6e, reversing
changes made to 932e28b13e.
The commit apparently broke builds with shared libs, and "suggesting"
the use of external libraries that need to be explicitly enable has
dubious usefulness anyway.
* commit '740b0bf03b4bb8b0a0e964750817ac0363a33c55':
build: Ignore generated .version files
This commit is a noop, see fbc304239f
Merged-by: James Almer <jamrial@gmail.com>
* commit 'acfa7a2178f08fd81b66279959cd55ec3ae237e2':
configure: Drop weak dependencies on external libraries for webm muxer
This commit is a noop.
Merged-by: James Almer <jamrial@gmail.com>
* commit '3ad825793a43253154bed05827f27425fc0757df':
hwcontext_cuda: implement frames_get_constraints
This commit is a noop, c16fe1432d
Merged-by: James Almer <jamrial@gmail.com>
* commit 'b420a27e74750b60d2e064236afb10be06a38ace':
avconv: allow -b to be used with streamcopy
This commit is a noop. We already have this functionality.
Merged-by: James Almer <jamrial@gmail.com>
* commit 'ab2539bd374fe7ddbc6e2f058b62645cd5076192':
ffv1: Convert to the new bitstream reader
h261dec: Convert to the new bitstream reader
shorten: Convert to the new bitstream reader
ralf: Convert to the new bitstream reader
loco: Convert to the new bitstream reader
fic: Convert to the new bitstream reader
dirac: Convert to the new bitstream reader
cavs: Convert to the new bitstream reader
aic: Convert to the new bitstream reader
golomb: Convert to the new bitstream reader
This commit is a noop, see
http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html
Merged-by: James Almer <jamrial@gmail.com>
* commit '612cc0712836af2f025b0c68b11da29b9f259d5a':
pgssubdec: reset rle_data_len/rle_remaining_len on allocation error
This commit is a noop, see 842e98b4d8
Merged-by: James Almer <jamrial@gmail.com>
* commit 'ca62236a89f47bd871eaf69d8d9e837c93c55a6c':
vaapi_encode: Add VP8 support
vaapi_encode: Pass framerate parameters to driver
vaapi_h264: Enable VBR mode
vaapi_encode: Support VBR mode
This commit is a noop, see
ceb28c3cc42201c02e6dbe6546a4ffd1acab8293
Merged-by: James Almer <jamrial@gmail.com>
* commit 'dce2929efa8e82b0832a828f7e8cb81ff8c20a4e':
dashenc: copy language and role metadata from streams assigned to sets
Merged-by: Rodger Combs <rodger.combs@gmail.com>
* commit 'efd2fc41b3f0749f9715d50b581f22bbaa8c5b99':
dashenc: allow assigning all streams of a media type to an AdaptationSet
Merged-by: Rodger Combs <rodger.combs@gmail.com>
* commit '3d23a5f96ad72961c14ba3a0c2add8f2ab374b61':
dashenc: add support for assigning streams to AdaptationSets
Merged-by: Rodger Combs <rodger.combs@gmail.com>
* commit '9df9309d233f59d9706444a1e24ac24139f2640d':
dashenc: calculate stream bitrate from first segment if not available
Merged-by: Rodger Combs <rodger.combs@gmail.com>
The GnuTLS version is checked through the macro GNUTLS_VERSION_NUMBER,
but this wasn't introduced before 2.7.2. Building with older versions
of GnuTLS (using icc) warns:
src/libavformat/tls_gnutls.c(38): warning #193: zero used for undefined preprocessing identifier "GNUTLS_VERSION_NUMBER"
#if HAVE_THREADS && GNUTLS_VERSION_NUMBER <= 0x020b00
This adds a fallback to the older, deprecated LIBGNUTLS_VERSION_NUMBER
macro.
Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
Commit 598e416840 added use of
GNUTLS_E_PREMATURE_TERMINATION, which wasn't introduced to GnuTLS
before 2.99.x / 3.x. This fixes compilation with older versions.
Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
Fixes: runtime error: signed integer overflow: 16748560 + 2143729712 cannot be represented in type 'int'
Fixes: 3202/clusterfuzz-testcase-minimized-4988291642294272
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Fixes: runtime error: shift exponent 42 is too large for 32-bit type 'unsigned int'
Fixes: 3410/clusterfuzz-testcase-minimized-5313377960198144
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Fixes: runtime error: signed integer overflow: -1562477869 + -691460395 cannot be represented in type 'int'
Fixes: 3196/clusterfuzz-testcase-minimized-4528307146063872
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Duration depends on the selected subsong and thus must be queried after
selecting the subsong. There is no compelling reason to query other
metadata earlier either.
Tested with libopenmpt version: 0.2.8760-beta27
Libopenmpt configure options: --without-ogg --without-vorbis
--without-vorbisfile --without-portaudio --without-portaudiocpp
--without-mpg123 --without-pulseaudio --without-sndfile --without-flac
Signed-off-by: Jörn Heusipp <osmanx@problemloesungsmaschine.de>
Signed-off-by: Josh de Kock <josh@itanimul.li>
James Almer
Rodger Combs
Moritz Barsnick
Frédéric Devernay
Thomas Mundt
Paul B Mahol
Paras Chadha
Martin Vignali
Michael Niedermayer
Jörn Heusipp