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

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

* commit '1839fafa':
  avconv: Support VDA hwaccel

Conflicts:
	Makefile
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

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

* commit '67afcefb':
  lavc: Add new VDA hwaccel

Conflicts:
	configure
	libavcodec/vda.h
	libavcodec/vda_h264.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '31a46750':
  vda: use hwaccel private data for internal bitstream buffer

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

* commit '66e6c8a7':
  lavu: Add a pixel format for new VDA hwaccel

Conflicts:
	doc/APIchanges
	libavutil/pixfmt.h
	libavutil/version.h
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'dd2d3b76':
  lavc: Add hwaccel private data and init/uninit callbacks

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

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

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

It leverages the new hwaccel 1.2 features:

- get_buffer2 is never called
- the internal context is automatically initialized/deinitialized
Signed-off-by: NLuca Barbato <lu_zero@gentoo.org>

The current hwaccel is broken and cannot be fixed in a compatible
way. It will be deprecated and replaced with a new one.

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>