* commit '68811a41':
  mpegvideo_enc: use the new encoding API for b_strategy=2
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'f03f78bc':
  mpegvideo_enc: handle encoding errors with b_strategy=2
Merged-by: Clément Bœsch <u@pkh.me>

* commit '6f733eca':
  mpegvideo_enc: add const to the AVCodec instance
Merged-by: Clément Bœsch <u@pkh.me>

* commit '6c09af7e':
  APIchanges: fix a typo in the version number

This commit is a noop (typo is not present in FFmpeg).
Merged-by: Clément Bœsch <u@pkh.me>

* commit '0e8d1fc1':
  lavu: Bump version for the 12bit Planar YUV support
  pixfmt: Add yuv444p12 pixel format
  pixfmt: Add yuv422p12 pixel format
  pixfmt: Add yuv420p12 pixel format

This merge is a noop, we already have all these pixel formats.
Merged-by: Clément Bœsch <u@pkh.me>

It was done on a whim because of the FATE header check and was actually
meant to be removed before pushing.

Also, nobody in review spotted it.

Reviewed-by: wm4

* commit '2b5b1e1e':
  swscale: Rename is9_OR_10 to match what it does

This commit is a noop. We use isNBPS() in these places instead since
d736b52a. is9_15BPS() wouldn't be a good name in our codebase due to
supporting only up to 14 (see 2ea585b8).
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'e87a501e':
  swscale: Update bitdepth range check

This commit is a noop.

Up to 14 bits is supported since fa36f334. This commits pushes the
limit to 15 bits but we don't seem to have pixel formats that enters in
that category.

12:03 <ubitux> so what's your opinion? should we move to 15 even if unused currently to make it consistent with libav and the function names, or keep our 14 suggesting there might be an issue with 15?
12:05 <ubitux> (functions are called hScale8To15_c, hScale16To15_c, ff_hscale8to15, ...)
12:06 <michaelni> I prefer to keep 14 until theres a case that allows us to test this and i suspect it will not work with 15 at least not all the code
Merged-by: Clément Bœsch <u@pkh.me>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

* commit 'de8e096c':
  swscale: Consistently order input YUV pixel formats
Merged-by: Clément Bœsch <u@pkh.me>

Avoids reading from uninitialized memory, regression since af1761f7

libavcodec now automatically serializes decoding for hwaccels which
are not thread-safe. This means API users, which rely on the libavcodec
native software fallback mechanism, can now simply enable threading
without running into problems.

Whatever it was supposed to do.

Certain hardware decoding APIs are not guaranteed to be thread-safe, so
having the user access decoded hardware surfaces while the decoder is
running in another thread can cause failures (this is mainly known to
happen with DXVA2).

For such hwaccels, only allow the decoding thread to run while the user
is inside a lavc decode call (avcodec_send_packet/receive_frame).

Merges Libav commit d4a91e65.
Signed-off-by: wm4 <nfxjfg@googlemail.com>
Tested-by: Michael Niedermayer <michael@niedermayer.cc>

Merges Libav commit 8dfba25c.
Signed-off-by: wm4 <nfxjfg@googlemail.com>

This improves commit 59c70227.

In ff_thread_report_progress(), the fast code path can load
progress[field] with the relaxed memory order, and the slow code path
can store progress[field] with the release memory order. These changes
are mainly intended to avoid confusion when one inspects the source code.
They are unlikely to have measurable performance improvement.

ff_thread_report_progress() and ff_thread_await_progress() form a pair.
ff_thread_await_progress() reads progress[field] with the acquire memory
order (in the fast code path). Therefore, one expects to see
ff_thread_report_progress() write progress[field] with the matching
release memory order.

In the fast code path in ff_thread_report_progress(), the atomic load of
progress[field] doesn't need the acquire memory order because the
calling thread is trying to make the data it just decoded visible to the
other threads, rather than trying to read the data decoded by other
threads.

In ff_thread_get_buffer(), initialize progress[0] and progress[1] using
atomic_init().
Signed-off-by: Wan-Teh Chang <wtc@google.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>

Merges Libav commit 343e2833.
Signed-off-by: wm4 <nfxjfg@googlemail.com>

When decoding with threads enabled, the get_format callback will be
called with one of the per-thread codec contexts rather than with the
outer context.  If a hwaccel is in use too, this will add a reference
to the hardware frames context on that codec context, which will then
propagate to all of the other per-thread contexts for decoding.  Once
the decoder finishes, however, the per-thread contexts are not freed
normally, so these references leak.

Merges Libav commit fd0fae60.
Signed-off-by: wm4 <nfxjfg@googlemail.com>

Merges Libav commit 84f22568.
Signed-off-by: wm4 <nfxjfg@googlemail.com>

Merges Libav commit 59c70227.
Signed-off-by: wm4 <nfxjfg@googlemail.com>

Merges Libav commit 64a31b28.
Signed-off-by: wm4 <nfxjfg@googlemail.com>

Since we've disabled side data merging in ffmpeg.c, this really changes
nothing.

This patch deprecates anything that has to do with merging/splitting
side data. Automatic side data merging (and splitting), as well as all
API symbols involved in it, are removed completely.

Two FF_API_ defines are dedicated to deprecating API symbols related to
this: FF_API_MERGE_SD_API removes av_packet_split/merge_side_data in
libavcodec, and FF_API_LAVF_KEEPSIDE_FLAG deprecates
AVFMT_FLAG_KEEP_SIDE_DATA in libavformat.

Since it was claimed that changing the default from merging side data to
not doing it is an ABI change, there are two additional FF_API_ defines,
which stop using the side data merging/splitting by default (and remove
any code in avformat/avcodec doing this): FF_API_MERGE_SD in libavcodec,
and FF_API_LAVF_MERGE_SD in libavformat.

It is very much intended that FF_API_MERGE_SD and FF_API_LAVF_MERGE_SD
are quickly defined to 0 in the next ABI bump, while the API symbols are
retained for a longer time for the sake of compatibility.
AVFMT_FLAG_KEEP_SIDE_DATA will (very much intentionally) do nothing for
most of the time it will still be defined. Keep in mind that no code
exists that actually tries to unset this flag for any reason, nor does
such code need to exist. Code setting this flag explicitly will work as
before. Thus it's ok for AVFMT_FLAG_KEEP_SIDE_DATA to do nothing once
side data merging has been removed from libavformat.

In order to avoid that anyone in the future does this incorrectly, here
is a small guide how to update the internal code on bumps:

- next ABI bump (probably soon):
  - define FF_API_LAVF_MERGE_SD to 0, and remove all code covered by it
  - define FF_API_MERGE_SD to 0, and remove all code covered by it
- next API bump (typically two years in the future or so):
  - define FF_API_LAVF_KEEPSIDE_FLAG to 0, and remove all code covered
    by it
  - define FF_API_MERGE_SD_API to 0, and remove all code covered by it

This forces anyone who actually wants packet side data to temporarily
use deprecated API to get it all. If you ask me, this is batshit fucked
up crazy, but it's how we roll. Making AVFMT_FLAG_KEEP_SIDE_DATA to be
set by default was rejected as an ABI change, so I'm going all the way
to get rid of this once and for all.
Reviewed-by: James Almer <jamrial@gmail.com>
Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>

This filter does not implement all features of MPEG7. Missing features:
- compression of signature files
- work only on (cropped) parts of the video
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '70de2ea4':
  nvenc: Extended rate-control support as provided by SDK 7

This commit is a noop, see facc19efMerged-by: Clément Bœsch <u@pkh.me>

* commit '358c887a':
  nvenc: Add support for high bitdepth

This commit is a noop, see d1bf8a3aMerged-by: Clément Bœsch <u@pkh.me>

* commit 'e02e2515':
  nvenc: Add some easier to understand presets that match x264 terminology

This commit is a noop, see a81b000a and
faffff88.
Merged-by: Clément Bœsch <u@pkh.me>

* commit '352741b5':
  nvenc: Make sure that enum and array index match

This commit is a noop, see a81b000aMerged-by: Clément Bœsch <u@pkh.me>

* commit '12004a9a':
  audiodsp/x86: yasmify vector_clipf_sse
  audiodsp: reorder arguments for vector_clipf

Merged the version from Libav after a discussion with James Almer on
IRC:

19:22 <ubitux> jamrial: opinion on 12004a9a?
19:23 <ubitux> it was apparently yasmified differently
19:23 <ubitux> (it depends on the previous commit arg shuffle)
19:24 <ubitux> i don't see the magic movsxdifnidn in your port btw
19:24 <ubitux> it's a port from 1d36defe
19:25 <jamrial> seems better thanks to said arg shuffle
19:25 <jamrial> the loop is the same, but init is simpler
19:25 <jamrial> probably worth merging
19:25 <ubitux> OK
19:25 <ubitux> thanks
19:26 <jamrial> curious they didn't make len ptrdiff_t after the previous bunch of commits, heh
19:26 <ubitux> yeah indeed

Both commits are merged at the same time to prevent a conflict with our
existing yasmified ff_vector_clipf_sse.
Merged-by: Clément Bœsch <u@pkh.me>

Regression since 4563a86f.

See 20c4fb2e for more information.
Tested-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'bf58545a':
  audiodsp: fix vector_clipf documentation
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'e9ef6171':
  checkasm: add tests for audiodsp
Merged-by: Clément Bœsch <u@pkh.me>

* commit '2eb97af6':
  checkasm: add a test for blockdsp
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'eea9857b':
  blockdsp: drop the high_bit_depth parameter

This commit is a noop, see 562ba4a8Merged-by: Clément Bœsch <u@pkh.me>

* commit '340f12f7':
  hwcontext_cuda: Add P010 and YUV444P16 pixel format

This commit is a noop, we already have P010 and P016.

18:52 <@BtbN> Adding AV_PIX_FMT_YUV444P16 won't hurt, but doesn't gain anything.
18:53 <@BtbN> I'd say just noop it. If we'll ever need it, it will be added in turn.
Merged-by: Clément Bœsch <u@pkh.me>

* commit '75d98e30':
  audiodsp/x86: clear the high bits of the order parameter on 64bit
Merged-by: Clément Bœsch <u@pkh.me>

* commit '1d6c76e1':
  audiodsp/x86: fix ff_vector_clip_int32_sse2

No functionnal changes, only cosmetics. This issue was fixed in
9a9e2f1c.
Merged-by: Clément Bœsch <u@pkh.me>

* commit '07e1f99a':
  x86util: Document SBUTTERFLY macro
Merged-by: Clément Bœsch <u@pkh.me>