diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-20 22:38:11 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-20 22:39:54 +0100 |
commit | 4d216420bed9d02cf0989d1e986247c1cd2f36c4 (patch) | |
tree | 9d5316d57b022fea0185f1c17eaa217a82fb51dd /libavcodec/vdpau_vc1.c | |
parent | e98bac82e5152f492ef05deff562abb2c68ec2ca (diff) | |
parent | 7948a51b5c3d08e1a1173442a7ff72b220def303 (diff) | |
download | ffmpeg-4d216420bed9d02cf0989d1e986247c1cd2f36c4.tar.gz |
Merge commit '7948a51b5c3d08e1a1173442a7ff72b220def303'
* commit '7948a51b5c3d08e1a1173442a7ff72b220def303':
vdpau: don't assume Picture and H264Picture are the same
Conflicts:
libavcodec/vdpau.c
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 9f3901a078..475a8db7b0 100644 --- a/libavcodec/vdpau_vc1.c +++ b/libavcodec/vdpau_vc1.c @@ -93,7 +93,7 @@ static int vdpau_vc1_start_frame(AVCodecContext *avctx, info->deblockEnable = v->postprocflag & 1; info->pquant = v->pq; - return ff_vdpau_common_start_frame(pic, buffer, size); + return ff_vdpau_common_start_frame(pic_ctx, buffer, size); } static int vdpau_vc1_decode_slice(AVCodecContext *avctx, @@ -105,7 +105,7 @@ static int vdpau_vc1_decode_slice(AVCodecContext *avctx, struct vdpau_picture_context *pic_ctx = pic->hwaccel_picture_private; int val; - val = ff_vdpau_add_buffer(pic, buffer, size); + val = ff_vdpau_add_buffer(pic_ctx, buffer, size); if (val < 0) return val; |