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>

* commit '892acc70':
  configure: Fail if cuda was enabled and is not available

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

Based on a dependency addition from fbec58da

* commit 'f55c0a64':
  build: Drop stray golomb dependencies
Merged-by: James Almer <jamrial@gmail.com>

* commit 'fbec58da':
  build: Add an internal component for hevc_ps code

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

* commit 'f912fd76':
  Add missing #includes for standalone spherical-information-related headers
  fate: Add spherical and stereo3d mov tests
  avprobe: Allow specifying multiple stream entries to be shown

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

* commit 'e90137c0':
  mov: Export spherical information
  lavc: Add spherical packet side data API
  lavu: Add AVSphericalMapping type and frame side data

This commit is a noop, see
8f58ecc3
e7a6f8c9
4dcdecf4Merged-by: James Almer <jamrial@gmail.com>

* commit '075acbb6':
  lavu: Add a video section to Doxygen documentation
Merged-by: James Almer <jamrial@gmail.com>

* commit '624aa8ab':
  build: Add missing Makefile entries and ifdefs for QSV hwaccels
Merged-by: James Almer <jamrial@gmail.com>

* commit 'c833c203':
  build: Ensure that the "all" target appears before all Makefile includes
Merged-by: James Almer <jamrial@gmail.com>

* commit '6bd9590b':
  build: Have old H.264/HEVC nvenc encoders select their new counterparts
Merged-by: James Almer <jamrial@gmail.com>

* commit '3e105d08':
  build: Move entries related to building TOOLS to a subdirectory Makefile
Merged-by: James Almer <jamrial@gmail.com>

* commit '4104cc56':
  build: Warn that reconfiguration is necessary if version.h files changed
Merged-by: James Almer <jamrial@gmail.com>

* commit 'f22da2cd':
  configure: add -fPIE instead of -pie to C flags for ThreadSanitizer

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

* commit '404cb747':
  configure: Pass CFLAGS_HEADERS through the right CFLAGS filter
Merged-by: James Almer <jamrial@gmail.com>

* commit '9265364b':
  build: Separate avisynth and avxsynth support

Mostly noop, since it could break linux configure with --enable-avisynth,
and the configure code which was simplified isn't even present in
ffmpeg.

Only merged the cosmetic re-ordering in the Makefile.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Fixes some valgrind warnings.
Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>

Signed-off-by: Matthew Gregan <kinetik@flim.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>