* commit 'b8cac1e8':
  vaapi_h265: Fix buffering parameters
  vaapi_h265: Fix slice header writing
  vaapi_h264: Write bitstream restriction fields
  vaapi_h264: Fix CFR mode with frame_rate set in AVCodecContext
  vaapi_encode: Decide on GOP setup before initialising sequence parameters

This merge is a noop, see:
  30ebabca vaapi_h265: Fix buffering parameters
  ae0230cc vaapi_h265: Fix slice header writing
  6796e6ea vaapi_h264: Write bitstream restriction fields
  658c5afa vaapi_h264: Fix CFR mode with frame_rate set in AVCodecContext
  ded1859d vaapi_encode: Decide on GOP setup before initialising sequence parameters
Merged-by: Clément Bœsch <u@pkh.me>

* commit '5cc0057f':
  lavu: remove the custom atomic API

This commit is a noop. The removal is postponed until all usages in
FFmpeg are dropped as well. A patchset is on discussion on the
mailing-list:
http://ffmpeg.org/pipermail/ffmpeg-devel/2017-March/209003.htmlMerged-by: Clément Bœsch <u@pkh.me>

This supports retrieving the device from a provided hw_frames_ctx, and
automatically creating a hw_frames_ctx if hw_device_ctx is set.

The old API is not deprecated yet. The user can still use
av_vdpau_bind_context() (with or without setting hw_frames_ctx), or use
the API before that by allocating and setting hwaccel_context manually.

Cherry-picked from Libav commit 1a7ddba5.
(Adds missing APIchanges entry to the Libav version.)
Reviewed-by: Mark Thompson <sw@jkqxz.net>

This "reuses" the flags introduced for the av_vdpau_bind_context() API
function, and makes them available to all hwaccels. This does not affect
the current vdpau API, as av_vdpau_bind_context() should obviously
override the AVCodecContext.hwaccel_flags flags for the sake of
compatibility.

Cherry-picked from Libav commit 16a163b5.
Reviewed-by: Mark Thompson <sw@jkqxz.net>

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

In this case, the user only supplies a device and the frame context
is allocated internally by lavc.

(cherry picked from commit 5dd9a4b8)

libavcodec/vaapi.h:58:1: warning: attribute 'deprecated' is ignored, place it after "struct" to apply attribute to type declaration [-Wignored-attributes]

(cherry picked from commit ed6a891c)
Signed-off-by: Mark Thompson <sw@jkqxz.net>

Should fix Chromium issue 704064.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>

* commit '59c70227':
  pthread_frame: use atomics for frame progress

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

* commit '64a31b28':
  pthread_frame: use atomics for PerThreadContext.state

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

* commit 'db273325':
  pthread_frame: use a thread-safe way for signalling threads to die

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

* commit '8385ba53':
  mmaldec: convert to stdatomic
Merged-by: Clément Bœsch <u@pkh.me>

* commit '3a165c18':
  v4l2: convert to stdatomic
Merged-by: Clément Bœsch <u@pkh.me>

* commit '27079a42':
  buffer: convert to stdatomic
Merged-by: Clément Bœsch <u@pkh.me>

USE_ATOMICS is only set if there is no thread implementation enabled, in
which case you can't expect any lock mechanism from FFmpeg.

This is also conflicting with the incoming use of stdatomic.

* commit 'eb34d403':
  Add a compat dummy stdatomic.h used when threading is disabled
  Add a compat stdatomic.h implementation based on pthreads
  Add a compat stdatomic.h implementation based on suncc atomics
  Add a compat stdatomic.h implementation based on windows atomics
  Add a compat stdatomic.h implementation based on GCC atomics

This merge is a noop, see:
  41e891e8 Add a compat dummy stdatomic.h used when threading is disabled
  74b5f108 Add a compat stdatomic.h implementation based on pthreads
  70faadc8 Add a compat stdatomic.h implementation based on suncc atomics
  c91e72ed Add a compat stdatomic.h implementation based on windows atomics
  3359eede Add a compat stdatomic.h implementation based on GCC atomics
Merged-by: Clément Bœsch <u@pkh.me>

* commit '13f5d2bf':
  configure: check for stdatomic.h

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

* commit 'b015872c':
  huffyuvdsp: Enable the altivec code for PPC little-endian as well

This commit is a noop, see 902ce2a6 and
libavcodec/ppc/lossless_videodsp_altivec.c
Merged-by: Clément Bœsch <u@pkh.me>

* commit '1d25a869':
  huffyuvdsp: Reenable PPC optimizations

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

* commit '22c3ab18':
  checkasm: Add test for huffyuvdsp add_bytes

huffyuvdsp is renamed to llviddsp to be consistent with our codebase.

Note: af607b7e wasn't actually required for this test since this
commit is not actually testing huffyuvdsp.
Merged-by: Clément Bœsch <u@pkh.me>

Only the pixel format is required in that init function. This will also
simplify the incoming merge.

* commit '27085d1b':
  avconv: only retry decoding on actual decoding errors
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'f6772e9b':
  avconv: make sure the filtergraph is freed on init failure

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

* commit 'd10102d2':
  avconv: set the encoding framerate when the output is CFR

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

* commit '5bf2454e':
  h264dec: support broken files with mp4 extradata/annex b data

This commit is a noop, see 93b89868

The sample pointed out on
https://github.com/HandBrake/HandBrake/issues/339 decodes fine in
FFmpeg.
Merged-by: Clément Bœsch <u@pkh.me>

* commit '2124711b':
  hwcontext_vaapi: add a quirk for the missing MemoryType attribute

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

* commit 'b57e38f5':
  ac3dsp: x86: Replace inline asm for in-decoder downmixing with standalone asm
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'a9ba5959':
  ac3dsp: Add some special-case handling for the C downmix function
Merged-by: Clément Bœsch <u@pkh.me>

* commit '43717469':
  ac3dsp: Reverse matrix in/out order in downmix()
Merged-by: Clément Bœsch <u@pkh.me>

use the option set by user
Reported-by: Lancelot Lai <laihy23@gmail.com>
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>