* commit 'ebc29519':
  hwaccel: Support specific frame allocators

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

* commit 'a871ef0c':
  hwaccel: Rename priv_data_size to frame_priv_data_size

Conflicts:
	libavcodec/avcodec.h
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '08bb2567':
  lavc: document which parts of AVHWAccel are private.
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '5c1d7246':
  lavc: set AVCodecContext.hwaccel in ff_get_format()

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

* commit '632ad224':
  lavc: Add an internal wrapper around get_format()

Conflicts:
	libavcodec/h264_slice.c
	libavcodec/mpeg12dec.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

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

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

It would reduce the boilerplate code users have to write.

This describes more accurately what this field is for.

This way each decoder does not have to do the same thing manually.

It will be useful in the following commits.

Reviewed-by: NReimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Signed-off-by: NLukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Signed-off-by: NAman Gupta <ffmpeg@tmm1.net>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Fixes CID1135747
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Should fix Coverity Scan issue #732265
Signed-off-by: NReynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>

Signed-off-by: NReimar Döffinger <Reimar.Doeffinger@gmx.de>

Fixes CID751770
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Including stdint.h was enough for systems like Mingw, but apparently not for Linux.
This should fix make checkheaders failures on every platform
Signed-off-by: NJames Almer <jamrial@gmail.com>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

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

Fixes make checkheaders
Signed-off-by: NJames Almer <jamrial@gmail.com>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Fixes CID1212261
Reviewed-by: NClément Bœsch <u@pkh.me>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Fixes CID1212260
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

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

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

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

* commit '9880a0d4':
  pcm-dvd: Fix 20bit decoding

See: 5db49fc3Merged-by: NMichael Niedermayer <michaelni@gmx.at>

Increment the pointer as needed.

Bug-Id: 592
Signed-off-by: NLuca Barbato <lu_zero@gentoo.org>

As per RFC3550, section 4, the NTP time is provided as 64-bit unsigned
integer, so follow the same logic here.
Reviewed-by: NLuca Barbato <lu_zero@gentoo.org>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

This fixes build failures on older mingw chains (before 2012).
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

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

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

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

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

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

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