* commit '307eb1a8':
  x86: vp8dsp: port FILTER_BILINEAR macro to cpuflags
Merged-by: James Almer <jamrial@gmail.com>

* commit '994c4bc1':
  x86util: Port all macros to cpuflags

See d5f8a642Merged-by: James Almer <jamrial@gmail.com>

* commit '522d850e':
  h264_cavlc: check the value of run_before

[10:00:09] <jamrial> michaelni: what do you think of libav commit
522d850e?
[10:00:45] <jamrial> it applies, but i can't reproduce the invalid
reads with the sample from the ticket mentioned in it
[10:52:57] <michaelni> jamrial, if theres an issue it should be fixed
by enlarging the scantable (as its faster) or maybe you can even drop
the if/else and use vlcs that are never returning a out of range
value. Id say the FFMIN is wrong in all cases, it should be a error
return if a check is added not silently continuing
[11:22:11] <michaelni> jamrial, i think the mb_padding stuff we have
makes it unneeded but we can possibly improve it beyond what we have

This commit is a noop
Merged-by: James Almer <jamrial@gmail.com>

Sets the correct start padding value when an edit list is present.

A new fate test is added, fate-mov-440hz-10ms, to ensure this is
handled correctly.
Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Reviewed-by: Sasi Inguva <isasi-at-google.com@ffmpeg.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

We now require 2.1+ with pkg-config.
Signed-off-by: Michael Bradshaw <mjbshaw@google.com>

* commit '83b2b34d':
  h2645_parse: use the bytestream2 API for packet splitting
Merged-by: James Almer <jamrial@gmail.com>

* commit 'b76f6a76':
  h264dec: initialize field_started to 0 on each decode call

This commit is a noop
Merged-by: James Almer <jamrial@gmail.com>

transfer_func variable passed to retry_transfer_wrapper
are h->prot->url_read and h->prot->url_write functions.
These need to return EOF or other error properly.
In case of returning >= 0, url_read/url_write is retried
until error is returned.
Signed-off-by: Daniel Kucera <daniel.kucera@gmail.com>

Otherwise the frame size of the codec is not set in the buffersink.

Fixes ticket #6603 and the following simpler case:

ffmpeg -c aac -filter_complex "sine=d=0.1,asetnsamples=1025" out.aac
Signed-off-by: Marton Balint <cus@passwd.hu>

Signed-off-by: Marton Balint <cus@passwd.hu>

This can trigger a single-byte overread if the codebook has the maximum
number of entries.

Fixes #6743.

SEI headers should be inserted as generic raw data (the old specific
type has been deprecated in libva2).

Fixes CID 1419829.

Fixes CID 1419834.

Fixes CID 1419832, 1419835.

Tested with the alphaconformanceG sample.

Fixes CID 1419836.

(cherry picked from commit 9ed18f30)

Helps with use cases such as static linking, as the .pc file
does actually contain the necessary Libs.private entries for all
required dependencies.

* commit '3a0d5e20':
  arm/aarch64: vp9itxfm: Skip loading the min_eob pointer when it won't be used
  arm: vp9itxfm: Template the quarter/half idct32 function

This commit is a noop, see
b7a565fe
70317b25Merged-by: James Almer <jamrial@gmail.com>

* commit 'b57a95d0':
  cfhd: Add FATE tests
Merged-by: James Almer <jamrial@gmail.com>

Ported from libav. Authored by one of the following:

Anton Khirnov <anton@khirnov.net>
Diego Biurrun <diego@biurrun.de>
Vittorio Giovara <vittorio.giovara@gmail.com>

Reviewed-by: kierank
Signed-off-by: James Almer <jamrial@gmail.com>

Signed-off-by: Gyan Doshi <gyandoshi@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '5f794aa1':
  Add Cineform HD Decoder

See 3485332b.

Some cosmetics are merged. The refactoring is not merged at the
request of Kieran Kunhya.
Merged-by: James Almer <jamrial@gmail.com>

* commit 'f6790b5e':
  add initial QP value options

This commit is a noop, see 5f44a4a0Merged-by: James Almer <jamrial@gmail.com>

* commit '8a60bba0':
  avcodec: clarify some decoding/encoding API details

This commit is a noop, see f940492bMerged-by: James Almer <jamrial@gmail.com>

Found-by: James Almer

This starts a new section - 3.4 has been released.

Use the appropriate metadata filter for each codec - in the absence of any
options to modify the stream, the output bitstream should be identical to
the input (though the output file may differ in padding).

All tests use conformance bitstreams, the MPEG-2 streams are newly added
from the conformance test streams
<http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_IEC_13818-4_2004_Conformance_Testing/Video/>

(cherry picked from commit 3cae7f8b)
(cherry picked from commit fbd63170)

(cherry picked from commit 10eb496d)

Matching the H.264 encoder.

(cherry picked from commit e3e8eab3)

Also improves the metadata and generally makes the configuration
a bit cleaner.

(cherry picked from commit ac124867)

This should be ticks, not time_scale steps - it was wrong for all
framerates not a multiple of 1/2.

(cherry picked from commit 30645174)

Included by default with non-IDR intra frames.

(cherry picked from commit a49ee60d)

Adds a new private option to enable them (off by default).

(cherry picked from commit 820a4483)

(cherry picked from commit 7a4fac5e)

(cherry picked from commit b78c30d7)

This will be used later in both the mpeg2_metadata filter and the
VAAPI MPEG-2 encoder.  Also adds a unit test.

(cherry picked from commit b5859e0b)

This is able to modify some header metadata found in the VPS/SPS/VUI,
and can also add/remove AUDs.

(cherry picked from commit b31a9eae)

This applies a specific fixup to some Blu-ray streams which contain
redundant PPSs modifying irrelevant parameters of the stream which
confuse other transformations which require correct extradata.

A new single global PPS is created, and all of the redundant PPSs
within the stream are removed.

(cherry picked from commit e6874bc3)

This is able to modify some header metadata found in the SPS/VUI,
and can also add/remove AUDs and insert user data in SEI NAL units.

(cherry picked from commit 9e93001b)
(cherry picked from commit c42b62d1)