* commit '172b2cee':
  dxva2: Add ifdefs around structs that might not be available

Conflicts:
	libavcodec/dxva2.c

See: 94d07b31Merged-by: Michael Niedermayer <michaelni@gmx.at>

This was a regression introduced with 4a006b9e.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Martin Storsjö <martin@martin.st>

Use integers, avoid potential rounding issues
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

The option was added in commit d9ae1031
but it was never documented. The text is based on the one written by the
commit author for the corresponding AVFormatContext.max_interleave_delta
field.

Fixes CID1302838
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This may actually result in a non-zero MV. Fixes ticket 4583.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '28fa58cf':
  dxva2: Fix build when only D3D11 or DXVA2 is used

Conflicts:
	libavcodec/dxva2_internal.h

See: 94d07b31Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '31de41ba':
  configure: Check if ID3D11VideoDecoder exists, not just the header to enable d3d11va

Conflicts:
	configure

See: a838b22bMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '08d006f5':
  h264: Fix HWACCEL_MAX for D3D11

See: 1b236541Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '674b7914':
  hevc: Fix HWACCEL_MAX for D3D11

See: 688147cfMerged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

See SMPTE 377-1-2009 6.3.3 KLV Fill Items
Reviewed-by: tim nicholson <nichot20@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '63ce9fd2':
  rtmpdh: Use GMP functions directly, instead of nettle wrappers
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '84c5ff91':
  rtmpdh: Fix the indentation in a struct
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Martin Storsjö <martin@martin.st>

Fixes build with some mingw-w64 versions, that have got the header
but not the interface declaration.
Signed-off-by: Martin Storsjö <martin@martin.st>

Signed-off-by: Martin Storsjö <martin@martin.st>

Signed-off-by: Martin Storsjö <martin@martin.st>

mpz_import and mpz_export were added in GMP 4.1, in 2002.

This simplifies the DH code by clarifying that it only uses pure
bignum functions, no other parts of nettle/hogweed.
Signed-off-by: Martin Storsjö <martin@martin.st>

Signed-off-by: Martin Storsjö <martin@martin.st>

Reviewed-by: Philip Langdale <philipl@overt.org>
Signed-off-by: James Almer <jamrial@gmail.com>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This also avoids using a floating point operation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b08caa87':
  nvenc: H264 and HEVC encoders

Conflicts:
	Changelog
	configure
	libavcodec/Makefile
	libavcodec/version.h

This implementation is merged under the name nvenc_b*
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '522d971c':
  xsub: Check memory allocation

Conflicts:
	libavcodec/xsubdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '83797da6':
  wma: Check memory allocation

See: 8559a714Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e1ea365f':
  truemotion2: Check memory allocation

Conflicts:
	libavcodec/truemotion2.c

See: d49f2603Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '28fb80dc':
  svq1: Check memory allocation

Conflicts:
	libavcodec/svq1enc.c

See: 2a3af772Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '42df71d9':
  ratecontrol: Check memory allocation

Conflicts:
	libavcodec/ratecontrol.c

See: 0898a6d4Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0994e142':
  pthread: Check memory allocation

Conflicts:
	libavcodec/pthread_frame.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '03927cb7':
  psymodel: Check memory allocation

Conflicts:
	libavcodec/psymodel.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'fef2f472':
  xvid: Check memory allocation

See: 5c95de15 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '9fb483fe':
  x264: Check memory allocation

See: 066dc043 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '41658bc8':
  libtheora: Check memory allocation

Conflicts:
	libavcodec/libtheoraenc.c

See: 67d4d5f5
See: 27216bf3Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8df5fbf0':
  lcl: Check memory allocation

Conflicts:
	libavcodec/lclenc.c

See: 6dbcecd7Merged-by: Michael Niedermayer <michaelni@gmx.at>