* commit '173b5621':
  lavf: make avio_read_partial() public
  swscale: Do not expand a macro with 'defined' in it
  configure: Include d3d11va_extralibs in libavutil

This commit is a noop, see
69218b41
add7b3bc
5d766747Merged-by: James Almer <jamrial@gmail.com>

* commit 'feed2390':
  yadif: Account for the buffer alignment while processing the frame edges

See 221f902fMerged-by: James Almer <jamrial@gmail.com>

* commit '7b7760ad':
  aarch64: Fix negative movrel offsets for windows
Merged-by: James Almer <jamrial@gmail.com>

* commit '0c99b900':
  png: Support RGBA64 pixel format

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

* commit '9f5b77c1':
  png: Report more details regarding unsupported pixel formats
Merged-by: James Almer <jamrial@gmail.com>

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

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

* commit '4c0588b4':
  mpeg2enc: Don't mark all streams as component video
Merged-by: James Almer <jamrial@gmail.com>

* commit 'b78c30d7':
  lavc: Add mpeg2_metadata bitstream filter
  lavc: Add coded bitstream read/write support for MPEG-2
  cbs_h2645: Return error if writing fails
  h264dec: use a large enough field for reference list modification values
  xwddec: support 8bpp grayscale

This commit is a noop, see
b9c94e82
2aff557c
b4c915f4
686e388b
569721acMerged-by: James Almer <jamrial@gmail.com>

* commit 'd34a133b':
  dfa: Disallow odd width/height and add proper bounds check for DDS1 chunks
Merged-by: James Almer <jamrial@gmail.com>

* commit 'a14a12ca':
  vaapi_h265: Reduce the amount of padding in the stream
Merged-by: James Almer <jamrial@gmail.com>

* commit 'e3e8eab3':
  vaapi_h265: Add support for AUD NAL units
  vaapi_h265: Convert to use coded bitstream infrastructure
  vaapi_h264: Add support for SEI recovery points
  vaapi_h264: Add support for AUD NAL units
  vaapi_h264: Convert to use coded bitstream infrastructure
  lavc: Add hevc_metadata bitstream filter
  lavc: Add h264_redundant_pps bitstream filter
  lavc: Add h264_metadata bitstream filter
  lavc: Add trace_headers bitstream filter
  lavc: Add coded bitstream read/write support for H.265
  lavc: Add coded bitstream read/write support for H.264
  lavc: Add coded bitstream read/write API
  pixfmt: Support chroma-derived and ictcp color matrices
  h264: Add support for alternative transfer characterics SEI
  vaapi_encode: Move quality option to common code

This commit is a noop, see
9c878651
8c34a202
f3571048
6734eef6
b4c915f4
9b0c7aa0
9c7d70b4
a308872b
8b263062
03f982bb
2e29ca2a
281b68b0
0bc7575c
00179664
038a5125Merged-by: James Almer <jamrial@gmail.com>

* commit '1329c08a':
  hevc: Validate the number of long term reference pictures

See ea38e5a6Merged-by: James Almer <jamrial@gmail.com>

* commit 'b88da98b':
  hevc: Improve stream constraint values in common header
  h264: Add stream constraint values to the common header

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

* commit 'defe307f':
  mov: move stsd finalization to an appropriate place
  mov: Do not set stsd_count if mov_read_stsd() fails
  mov: log and return early on non-positive stsd entry counts

See 8b43ee40
656feb64Merged-by: James Almer <jamrial@gmail.com>

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

* commit 'b90fdb2c':
  hevcdec: add a CUVID hwaccel

Adapted for ffmpeg by Timo Rothenpieler.
Merged-by: James Almer <jamrial@gmail.com>

* commit '770cf1db':
  fate/hevc: specify output pixel format explicitly
Merged-by: James Almer <jamrial@gmail.com>

* commit '00fd914d':
  hevcdec: set the active SPS before calling get_format()
Merged-by: James Almer <jamrial@gmail.com>

* commit 'a58873b1':
  avconv: when using -loop option bail out if seek to start fails
Merged-by: James Almer <jamrial@gmail.com>

* commit '004ea637':
  cuvid: add cuvid.h to SKIPHEADERS

This commit is a noop, nvdec.h compiles just fine since it doesn't
depend on external headers.
Merged-by: James Almer <jamrial@gmail.com>

* commit 'b9129ec4':
  h264dec: add a CUVID hwaccel
  decode: add a per-frame private data for hwaccel use
  decode: add a mechanism for performing delayed processing on the decoded frames
  decode: add a method for attaching lavc-internal data to frames
  decode: avoid leaks on failure in ff_get_buffer()

This commit is a noop, see
4776c614
9f1cfd88
7fa64514
81c021c6
0e006243Merged-by: James Almer <jamrial@gmail.com>

Some parts of the code are based on a patch by
Timo Rothenpieler <timo@rothenpieler.org>

Merges Libav commit b9129ec4.

Due to the name clash with our cuvid decoder, rename it to nvdec.

This commit also changes the Libav code to dynamic loading of the
cuda/cuvid libraries.
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>

Currently, AVHWAccels are looked up using a (codec_id, pixfmt) tuple.
This means it's impossible to have 2 decoders for the same codec and
using the same opaque hardware pixel format.

This breaks merging Libav's CUVID hwaccel. FFmpeg has its own CUVID
support, but it's a full stream decoder, using NVIDIA's codec parser.
The Libav one is a true hwaccel, which is based on the builtin software
decoders.

Fix this by introducing another field to disambiguate AVHWAccels, and
use it for our CUVID decoders. FF_CODEC_CAP_HWACCEL_REQUIRE_CLASS makes
this mechanism backwards compatible and optional.

cuvid.c is used by Libav's CUVID hwaccel. Resolve the conflict and
avoid future merge problems by renaming our decoder.
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>

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

The encoder was reverse engineered from binary library and from
EP0398973B1 patent (long expired).
The decoder was simply deduced from the encoder.

This will be useful in the CUVID hwaccel. It should also eventually
replace current decoder-specific mechanisms used by various other
hwaccels.

Merges Libav commit 704311b2.

This will be useful in the CUVID hwaccel.

Merges Libav commit badf0951.

Use the AVFrame.private_ref field.

This new struct will be useful in the following commits.

Merges Libav commit 359a8a3e.

This gives FFmpeg libs a field that they can freely and safely use.
Avoiding the need of wrapping of a users opaque_ref field and its issues.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

ff_alloc_packet have been deprecated, switch to use
ff_alloc_packet2.
Signed-off-by: Jun Zhao <jun.zhao@intel.com>
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

ff_alloc_packet have been deprecated, switch to use the
ff_alloc_packet2.
Signed-off-by: Jun Zhao <jun.zhao@intel.com>
Reviewed-by: Arttu Ylä-Outinen <arttu.yla-outinen@tut.fi>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

The user-supplied value for timecode_rate in drawtext is rounded
to nearest integer. So, a supplied value of 0.49 or lower is rounded to 0.
This throws a misleading error message which says "Timecode frame rate must be
specified". Changed message to account for values under one.

Also noted supported framerates for drop TC.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

fix ticket id: #6820
Signed-off-by: Steven Liu <lq@onvideo.cn>
Tested-by: mrskman

Signed-off-by: Carl Eugen Hoyos <ceffmpeg@gmail.com>
Tested-by: Steven Liu <lq@chinaffmpeg.org>

Fixes: runtime error: value -36211.7 is outside the range of representable values of type 'short'
Fixes: 2992/clusterfuzz-testcase-6649611793989632

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpegSigned-off-by: Michael Niedermayer <michael@niedermayer.cc>

Based on a patch by Aaron Levinson.

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