* commit '47e547b3':
  lavc: add a null bitstream filter
Merged-by: Clément Bœsch <u@pkh.me>

* commit '0309ddcf':
  lavc: handle MP3 in get_audio_frame_duration()
Merged-by: Clément Bœsch <u@pkh.me>

* commit '6aa4ba71':
  dxva2: Keep code shared between dxva2 and d3d11va under the correct #if
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'b0e6b3f4':
  hevc: ppc: Add HEVC 4x4 IDCT for PowerPC
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'fc368497':
  configure: Add missing dxva2 dependency for dxva2_lib
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'f1248fae':
  configure: Handle dxva2 optional components in the standard way
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'a6901b9c':
  Drop libxvid rate control support for mpegvideo encoding

This commit is a noop, there is no known issue with it.
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'ac648bb8':
  dxva2: Simplify some ifdefs
Merged-by: Clément Bœsch <u@pkh.me>

* commit '7d81698b':
  vaapi_h265: Fix CFR mode with framerate set in AVCodecContext

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

* commit 'ade370a4':
  lavfi: Add VAAPI deinterlacer

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

* commit 'f8a1ead0':
  build: Add -D_XOPEN_SOURCE=600 to CPPFLAGS on Cygwin
Merged-by: Clément Bœsch <u@pkh.me>

* commit '39fbcf8f':
  configure: Fix _libs vs. _extralibs oversight

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

* commit 'be2d555c':
  build: Use _extralibs variable names instead of _libs everywhere
Merged-by: Clément Bœsch <u@pkh.me>

Since 52ccc4a0 was merged, it's pointless to keep our special version.

* commit '0507cd5b':
  build: Rename host_libs/HOSTLIBS variables to host_extralibs/HOSTEXTRALIBS
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'a7101eb4':
  configure: Simplify some library checks via check_lib()

This commit is a noop as it doesn't apply to FFmpeg:
- the nanosleep check doesn't use add_extralibs in FFmpeg
- the pthread checks check multiple functions before add the extra
  libraries
Merged-by: Clément Bœsch <u@pkh.me>

* commit '1818a640':
  build: Fix dependencies for alsa/jack/sndio support

Added explicit enable (which will be automatically added later on in
ee480790) to actually fix this commit. Without the explicit enables,
alsa, jack and sndio gets disabled.

Also added jack, alsa and sndio to the have list so the HAVE_* are
populated to make (this fixes the SKIPHEADERS chunks).
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'af451ac0':
  configure: Drop redundant and partly bogus vaapi/vdpau header checks
Merged-by: Clément Bœsch <u@pkh.me>

* commit '932cc649':
  vdpau: Do not #include vdpau_x11.h from the main vdpau header
Merged-by: Clément Bœsch <u@pkh.me>

Purpose: avdevice/decklink: Removed pthread dependency by replacing
semaphore used in code appropriately.  Doing so makes it easier to
build ffmpeg using Visual C++ on Windows.  This is a contination of
Kyle Schwarz's "avdevice/decklink: Remove pthread dependency" patch
that is available at https://patchwork.ffmpeg.org/patch/2654/ .  This
patch wasn't accepted, and as far as I can tell, there was no
follow-up after it was rejected.

Notes: Used Visual Studio 2015 (with update 3) for this.

Comments:

-- configure: Eliminated pthreads dependency for decklink_indev_deps
   and decklink_outdev_deps and replaced with threads dependency

-- libavdevice/decklink_common.cpp / .h:
a) Eliminated semaphore and replaced with a combination of a mutex,
   condition variable, and a counter (frames_buffer_available_spots).
b) Removed include of pthread.h and semaphore.h and now using
   libavutil/thread.h instead.

-- libavdevice/decklink_dec.cpp: Eliminated include of pthread.h and
   semaphore.h.

-- libavdevice/decklink_enc.cpp:
a) Eliminated include of pthread.h and semaphore.h.
b) Replaced use of semaphore with the equivalent using a combination
   of a mutex, condition variable, and a counter
   (frames_buffer_available_spots).  In theory, libavutil/thread.h and
   the associated code could have been modified instead to add
   cross-platform implementations of the sem_ functions, but an
   inspection of the ffmpeg source base indicates that there are only
   two cases in which semaphores are used (including this one that was
   replaced), so it was deemed to not be worth the effort.
Signed-off-by: Marton Balint <cus@passwd.hu>

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

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

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

The file is based on libopus, analyzed by Rostislav Pehlivanov.

refer to:
https://git.libav.org/?p=libav.git;a=commitdiff;h=0a4b9d0ccd10b3c39105f99bd320f696f69a75a2
add hls encrypt options looks like libav's libavformat/hlsenc.c
Reviewed-by: Moritz Barsnick <barsnick@gmx.net>
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>

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

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

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>

Found-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>

* commit '92e6b31c':
  dxva2: Adjust multiple inclusion guard names to follow convention

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

* commit 'dbfe60ca':
  vf_hwupload_cuda: Add min/max limits for device option

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

* commit '4efea4ce':
  APIChanges: Mention where release 12 was cut

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

* commit '3f75e511':
  avio: Keep track of the amount of data written
Merged-by: James Almer <jamrial@gmail.com>

* commit 'fc85646a':
  libopusdec: fix out-of-bounds read
  libschroedingerdec: fix leaking of framewithpts
  libschroedingerdec: don't produce empty frames

This commit is a noop, see

a86ebbf7
3c0328d5
8c8f543bMerged-by: James Almer <jamrial@gmail.com>

Made appropriate changes to be able to successfully
build C++ files using a Visual C++ build on Windows.

Based on an earlier patch by Kyle Schwarz.

Comments:

-- compat/w32pthreads.h: Made appropriate changes to w32pthreads.h to
   get it to build when it is being included in a C++ file and built
   with Visual C++.  This is mostly a copy of Kyle Schwarz's patch as
   described above.

-- configure:
a) Now calling set_ccvars CXX to cause the various CXX_ variables to
   be setup properly.  For example, with MSVC (Microsoft Visual C++),
   this causes CXX_O to be set to -Fo$@ instead of using the default
   value.  The default value does not work with Visual C++.  This
   change will also have the impact of correcting CXX_O (and possibly
   CXX_C) for other compilers, although this is really only relevant
   for the Intel compiler, in addition to MSVC.
b) Now using cl for the C++ compiler for the MSVC toolchain.  This is
   currently only relevant for building the
   Blackmagic/Decklink-related files under avdevice.
Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'd3da8a00':
  omx: Fix allocation check

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

* commit 'd32bdadd':
  qsvdec: Fix memory leak on error

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

* commit '6a93b596':
  compat/atomics: add typecasts in atomic_compare_exchange_strong()
Merged-by: James Almer <jamrial@gmail.com>

* commit '2170017a':
  avutil: fix data race in av_get_cpu_flags()

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

* commit 'd5759701':
  libkvazaar: Add missing header #includes
Merged-by: James Almer <jamrial@gmail.com>