(cherry picked from commit 92f0aceb)

(cherry picked from commit d41e10c1)

The private codec option will be used instead when available.

In order to prevent it from being forgotten and delayed until the next bump.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>

ffserver depends on it, so keep it in place until the two can be
removed together.

* commit 'bc143ce1':
  lavc: Drop deprecated chroma subsample function

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

* commit '63fe79a3':
  lavf: Drop deprecated hint to set muxer timebase
Merged-by: James Almer <jamrial@gmail.com>

* commit '263358e0':
  lavf: Drop deprecated AVFract type and related field
Merged-by: James Almer <jamrial@gmail.com>

* commit '5e712997':
  lavf: Drop deprecated bitexact functionality
Merged-by: James Almer <jamrial@gmail.com>

* commit '96a47364':
  lavfi: Drop deprecated non-const filter retrieval
Merged-by: James Almer <jamrial@gmail.com>

* commit '8e18328b':
  lavfi: Drop deprecated filter registration
Merged-by: James Almer <jamrial@gmail.com>

* commit '52067b3c':
  lavfi: Drop deprecated filter initialization
Merged-by: James Almer <jamrial@gmail.com>

* commit 'c5c7cfd5':
  lavfi: Drop deprecated functions to open a filter or a filterchain
Merged-by: James Almer <jamrial@gmail.com>

* commit '88fd836a':
  lavfi: Drop deprecated way of passing options for a few filters
Merged-by: James Almer <jamrial@gmail.com>

Fixes the following warning:
libavfilter/graphparser.c:122:10: warning: assignment discards 'const' qualifier from pointer target type

Fixes the following warnings:
libavdevice/lavfi.c:136:16: warning: assignment discards 'const' qualifier from pointer target type
libavdevice/lavfi.c:137:17: warning: assignment discards 'const' qualifier from pointer target type

* commit '07a2b155':
  Bump major versions of all libraries

A few API deprecated ~2 years ago or more are also postponed here for
varying reasons.

FF_API_LOWRES:
Since this functionality depends on AVStream->codec, i figure the two can
be removed at the same time in the next bump or so.

FF_API_AVCTX_TIMEBASE:
Couldn't get this one to work. Not just libavcodec but apparently also
libavformat and ffmpeg.c expect AVCodecContext->time_base to be set for
decoding. Upon removal some tests report a different generic stream time
base (like 1/25), and others lose packet duration values. I guess it's
somehow tied to the AVStream->codec clusterfuck.
It can be dealt with alongside FF_API_LAVF_AVCTX in the next bump.

FF_API_OLD_FILTER_OPTS_ERROR:
This one is meant to remain after FF_API_OLD_FILTER_OPTS is removed.
Its purpose is displaying the corrected command line using the new syntax
as a suggestion as part of the error message.
Merged-by: James Almer <jamrial@gmail.com>

* commit '628ce8b8':
  flvdec: Set avg_frame_rate for video streams

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

* commit '8e234615':
  libavutil: Hook up the rest of the gcc specific attributes to clang as well
Merged-by: James Almer <jamrial@gmail.com>

* commit '3aa9c523':
  libavutil: Define the noreturn attribute for clang in MSVC mode as well
Merged-by: James Almer <jamrial@gmail.com>

* commit 'a46a4f72':
  dca: Refactor dca_filter_channels() a little
  dca: Validate the channel map

This commit is a noop, we have a different DCA decoder.
Merged-by: James Almer <jamrial@gmail.com>

* commit '3df77b58':
  nvenc: Allow different const qps for I, P and B frames

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

* commit 'ca960161':
  rtsp: Move message parsing to a separate function

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

* commit 'bd805964':
  configure: Do not treat JACK as a system library
Merged-by: James Almer <jamrial@gmail.com>

* commit '303fadf5':
  avconv: Document the -init_hw_device option
  avconv: Enable generic hwaccel support for VDPAU
  lavc: vdpau: add support for new hw_frames_ctx and hw_device_ctx API
  lavc: Add hwaccel_flags field to AVCodecContext
  avconv: Enable generic hwaccel support for VAAPI
  avconv: Generic device setup
  hwcontext: Make it easier to work with device types
  hwcontext: Add device derivation

This commit is a noop, see
b22172f6
0b1794a4
06043cc0
be510733
156bd827
7e4ba776
e462ace8
527a1e21Merged-by: James Almer <jamrial@gmail.com>

* commit 'b864230c':
  rtmp: Move RTMP digest calculation to a separate file
Merged-by: James Almer <jamrial@gmail.com>

* commit 'cfee5e1a':
  build: Add missing object dependency for extract_extradata bitstream filter

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

* commit '7995ebfa':
  arm/aarch64: vp9: Fix vertical alignment

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

* commit '827a05ea':
  matroskaenc: add support for Spherical Video elements

See 58eb0f57. Merged for cosmetics
purposes.
Also includes changes from d32d59bcMerged-by: James Almer <jamrial@gmail.com>

* commit '0d8013b8':
  configure: Replace -no_weak_symbols with -Werror=partial-availability
Merged-by: James Almer <jamrial@gmail.com>

* commit '681a86ab':
  x86: fft: Port to cpuflags
Merged-by: James Almer <jamrial@gmail.com>

* commit 'e9bb77fb':
  x86: h264: Simplify DEQUANT macro with cpuflags
Merged-by: James Almer <jamrial@gmail.com>

* 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>