diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-12 01:42:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-12 01:42:32 +0200 |
| commit | e10979ff5624248dc86780443df9ebd8cc48e246 (patch) | |
| tree | 9ee75c3d4d0dd42846cfb2a3cd439bece1f20479 /libavcodec/vaapi_internal.h | |
| parent | a8c2ff2c3cc5f28c36692031c342692cac742280 (diff) | |
| parent | b047941d7da470ba0dcedb1fd0aa828075265ffc (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
changelog: misc typo and wording fixes
H.264: add filter_mb_fast support for >8-bit decoding
doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support.
lls: use av_lfg instead of rand() in test program
build: remove unnecessary dependency on libs from 'all' target
H.264: avoid redundant alpha/beta calculations in loopfilter
H.264: optimize intra/inter loopfilter decision
mpegts: fix Continuity Counter error detection
build: remove unnecessary FFLDFLAGS variable
vp8/mt: flush worker thread, not application thread context, on seek.
mt: proper locking around release_buffer calls.
DxVA2: unbreak build after [657ccb5ac75ce34e62bd67f228d9bd36db72189e]
hwaccel: unbreak build
Eliminate FF_COMMON_FRAME macro.
Conflicts:
Changelog
Makefile
doc/developer.texi
libavcodec/avcodec.h
libavcodec/h264.c
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vaapi_internal.h')
| -rw-r--r-- | libavcodec/vaapi_internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vaapi_internal.h b/libavcodec/vaapi_internal.h index 43fa889d15..e514dd6f44 100644 --- a/libavcodec/vaapi_internal.h +++ b/libavcodec/vaapi_internal.h @@ -38,7 +38,7 @@ /** Extract VASurfaceID from a Picture */ static inline VASurfaceID ff_vaapi_get_surface_id(Picture *pic) { - return (uintptr_t)pic->data[3]; + return (uintptr_t)pic->f.data[3]; } /** Common AVHWAccel.end_frame() implementation */ |