diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-11 23:49:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-11 23:49:13 +0200 |
| commit | fa0f7c024e90a5337892cbc3b78e936ba5d25cf3 (patch) | |
| tree | 8e83e3ad53663a6bb0bbf6b381d6f1a9b82521ec /libavcodec/vdpau_vc1.c | |
| parent | 8d19dd91a51c296c92a9d94ab9541a3cb7316bab (diff) | |
| parent | a871ef0cc936612bdb0e643196be72efcf0c8986 (diff) | |
| download | ffmpeg-fa0f7c024e90a5337892cbc3b78e936ba5d25cf3.tar.gz | |
Merge commit 'a871ef0cc936612bdb0e643196be72efcf0c8986'
* commit 'a871ef0cc936612bdb0e643196be72efcf0c8986':
hwaccel: Rename priv_data_size to frame_priv_data_size
Conflicts:
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vdpau_vc1.c')
| -rw-r--r-- | libavcodec/vdpau_vc1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/vdpau_vc1.c b/libavcodec/vdpau_vc1.c index 85397890a4..13c41df66a 100644 --- a/libavcodec/vdpau_vc1.c +++ b/libavcodec/vdpau_vc1.c @@ -122,7 +122,7 @@ AVHWAccel ff_wmv3_vdpau_hwaccel = { .start_frame = vdpau_vc1_start_frame, .end_frame = ff_vdpau_mpeg_end_frame, .decode_slice = vdpau_vc1_decode_slice, - .priv_data_size = sizeof(struct vdpau_picture_context), + .frame_priv_data_size = sizeof(struct vdpau_picture_context), }; #endif @@ -134,5 +134,5 @@ AVHWAccel ff_vc1_vdpau_hwaccel = { .start_frame = vdpau_vc1_start_frame, .end_frame = ff_vdpau_mpeg_end_frame, .decode_slice = vdpau_vc1_decode_slice, - .priv_data_size = sizeof(struct vdpau_picture_context), + .frame_priv_data_size = sizeof(struct vdpau_picture_context), }; |