generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

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

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

See: 377cfc28a226a66d6f872f0a16b3811208011ebc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-03-20 23:07:10 +01:00
commit 19139d8516
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/vaapi_internal.h
View File

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