* commit '7b50d60442af8d9527e9da46818011fe15a5265a':
h264: call ff_h264_fill_mbaff_ref_list() when constructing the normal ref list
Merged-by: Clément Bœsch <clement@stupeflix.com>
* commit 'b93c0aed79f7f942e0dec26e53c147f297ce2ff6':
h264: drop an outdated comment
This commit is a noop, see 237d31e0b9
Merged-by: Clément Bœsch <clement@stupeflix.com>
* commit '77a1e2c5f8f8250dfacff24b993eb473260ed13e':
h264: move direct mode inits out of h264_slice_header_parse()
Merged-by: Clément Bœsch <clement@stupeflix.com>
This should not be needed anymore and simplifies the next merge
Requested-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This should not be needed anymore and simplifies the next merge
Requested-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Even though this is not part of the public API, some external
applications access fields after it, thus breaking after updating from
ffmpeg 3.0 or earlier.
Since it is not public, it can be freely moved to the end to avoid
that problem in the future.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
* commit '2940e196c5e439d9869f8c02a49a318d0847453c':
vaapi_h265: cu_qp_delta should not be used in constant-QP mode
Merged-by: Clément Bœsch <clement@stupeflix.com>
* commit '02fa1ad9266f9b1ea11565ac2f93f45853e351e8':
vaapi_h264: Add source version identifier as unregistered SEI
Merged-by: Clément Bœsch <clement@stupeflix.com>
* commit 'b668662939de3a02454cfc9ba3e6d10b87527a40':
get_bits: Move BITSTREAM_READER_LE definition before all relevant #includes
The merge commit also includes changes for libavcodec/interplayacm.c and
libavcodec/truemotion2rt.c
Merged-by: Clément Bœsch <clement@stupeflix.com>
* commit '2a48a75a6f508121b96b0732a9fe03a46303f579':
sgirledec: simplify, no need to use reget buffer
This commit is a noop, see ccc3f4e710
Merged-by: Clément Bœsch <clement@stupeflix.com>
* commit '6e2ad28cf76461b02d85ad178087ba0c628b8d9d':
aic: add frame threading support
This commit is a noop, see 8e069eb525
Merged-by: Clément Bœsch <clement@stupeflix.com>
* commit '20a8c78ce0a5baf37f6a94e2d1e57e186b6f4b54':
avconv: Do not copy extradata if source buffer is empty
This commit is a noop, see 4d02dfbde4
Merged-by: Clément Bœsch <u@pkh.me>
* commit '38f99017e69bd25e88be87117237c29727c25635':
vp9: Return the correct size when decoding a superframe
This commit is a noop, see c2f3715cb3
Merged-by: Clément Bœsch <u@pkh.me>
* commit 'b2d5d6a7f20a255a5f3c9bf539cc507afd909ce5':
build: Only enable symbol reduction if the compiler does proper DCE
Merged-by: Clément Bœsch <u@pkh.me>
P1, P2, and P3 are respectively the text versions of PBM, PGM and PPM
files.
We can not obtain the buffer size using av_imgage_get_buffer_size() as
every pixel in the picture will occupy a random size between 16 and 32
bits ("4 " and "231 " are such example).
Ideally, we could look for the next header (or EOF) in the bytestream,
but this commit is meant to fix a decoding regression introduced by
48ac4532d4.
Fix Ticket #5670
* commit '5b1b495c8d21600eac694d50f428654a3125e217':
build: Print a message when generating version scripts
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
* commit '1e9c5bf4c136fe9e010cc8a7e7270bba0d1bf45e':
asm: FF_-prefix internal macros used in inline assembly
This commit is a noop as the ASM codebase differs too much between libav
and ffmpeg. The corresponding chunks will be found in the next commit.
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
