Commit 19139d85 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vaapi: switch ff_vaapi_get_surface_id from Picture to AVFrame

Conflicts:
	libavcodec/vaapi.c
	libavcodec/vaapi_internal.h

See: 377cfc28Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 1ec295a5 8b6136d3
...@@ -35,10 +35,10 @@ ...@@ -35,10 +35,10 @@
* @{ * @{
*/ */
/** Extract VASurfaceID from a Picture */ /** Extract VASurfaceID from an AVFrame */
static inline VASurfaceID ff_vaapi_get_surface_id(AVFrame *frm) static inline VASurfaceID ff_vaapi_get_surface_id(AVFrame *pic)
{ {
return (uintptr_t)frm->data[3]; return (uintptr_t)pic->data[3];
} }
/** Common AVHWAccel.end_frame() implementation */ /** Common AVHWAccel.end_frame() implementation */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment