* commit 'd52208e8d549d4c84a2a348aa3790b1a177e779a':
mmaldec: Add mpeg2 decoding support
This commit is a noop, see 7ebe12fc55591053cbd194ca6638e5c32beaee45
Merged-by: Clément Bœsch <clement@stupeflix.com>
* commit '2689bb115ca64921789092148deaf213a0d94d2e':
mmaldec: Fix avpriv_atomic_get usage
This commit is a noop, see da43e9e157a3c64337348b44193ab390bd481911
Merged-by: Clément Bœsch <clement@stupeflix.com>
* commit '366ba2dee1f2b17825b42e2164d3b9879f0271b1':
mmaldec: Use av_assert0() instead of assert()
This commit is a noop, see c0152ebb9e0501b9d3d4386531995683a4ac824c
Merged-by: Clément Bœsch <clement@stupeflix.com>
* commit '5b1409c75563b4a3aca113c34d09e3b5442de47f':
fate: Add test for MSS1
Test was already present, see 849e55e58ecc6815e8bd326ac18dda748db48682.
The merge removes the audio decoding present in our version and
simplifies the rules.
Merged-by: Clément Bœsch <clement@stupeflix.com>
* commit '6eb2505855fa832ba7d0a1c2fb9f92c41c5446e3':
dds: Drop gray-alpha swapping
This commit is not merged, see 139cbeb75e0f5e3176b2b09660d2570b1bcc2408.
Merged-by: Clément Bœsch <clement@stupeflix.com>
* commit '39cdbb12aa2140520246bc4c3e22436b9f8a121a':
dxva2_h264: Unbreak compilation after 3176217c6
This commit is a noop. The compilation was fixed in the merge commit
itself (1534ef87c74cc66a117bf61c467641c2129bc964). The additional local
unused sps is not merged.
Merged-by: Clément Bœsch <clement@stupeflix.com>
* commit '4012fe1ee819edc7689e182189e66c5401fb4b41':
ape: Unbreak adaptcoeffs computation
This commit is a noop, see dd4fb2339f76a958bd7e63e5ac18b8c10852ae1a
Merged-by: Clément Bœsch <clement@stupeflix.com>
* commit '2e5bde956519ae19cedfa482e199518e495bcaf5':
h264: eliminate max_contexts
This commit is a noop as max_contexts can change and mismatch the
nb_slice_ctx (see 507b01f89969601f15555f7416804fb691632cbb).
The file in the Ticket is not decodable anymore, so it was not possible
to check if that code path was triggerable some way or another, or even
test a different fix.
Merged-by: Clément Bœsch <clement@stupeflix.com>
* commit 'e0652795292223f8bc8e5bac019c1fca7323d23c':
h264: remove an artificial restriction on the number of slice threads
Tested with multiple runs of fate-h264 THREADS=50 THREAD_TYPE=slice
Merged-by: Clément Bœsch <clement@stupeflix.com>
It has no use afterwards and freeing it before calling ff_flac_parse_picture()
may help prevent OOM issues on memory constrained scenarios.
Signed-off-by: James Almer <jamrial@gmail.com>
* commit 'b77fffa127663028169c5ed543956af4b9496c29':
h264: make slice threading work with deblocking_filter=1
again label, and SLICE_SINGLETHREAD error handling are preserved as that
SLICE_SINGLETHREAD can be raised on a remaining case.
slice_context_count is also kept since it's still in use.
Merged-by: Clément Bœsch <clement@stupeflix.com>
* commit '99c554efc8b09c3f1bb2fb41c3da5431085f7470':
h264: eliminate low_delay
ff_print_debug_info2() is adjusted to allow a NULL pointer as low_delay.
It's only useful for MPEG codecs with the exception of H264.
Merged-by: Clément Bœsch <clement@stupeflix.com>
The caps_internal field has moved without major bump and direct
access causes crashes, found when testing 3.1
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
We haven't had a stable release since the packet_gap addition, so probably it
is worth reworking the option to something that makes more sense to the end
user. Also add burst_bits option to specify maximum length of bit bursts.
Signed-off-by: Marton Balint <cus@passwd.hu>
* commit '755f79f84cbeb5d749fb120e55e0098a2d7663a0':
h264_refs: make the H264Context const where possible
ff_h264_decode_ref_pic_list_reordering() and h264_initialise_ref_list()
do not have a const H264Context * as they modify the default_ref inside
that context.
Merged-by: Clément Bœsch <u@pkh.me>
