diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-21 01:38:11 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-21 01:39:54 +0400 |
| commit | 4d216420bed9d02cf0989d1e986247c1cd2f36c4 (patch) | |
| tree | 9d5316d57b022fea0185f1c17eaa217a82fb51dd /libavcodec/vdpau_mpeg12.c | |
| parent | e98bac82e5152f492ef05deff562abb2c68ec2ca (diff) | |
| parent | 7948a51b5c3d08e1a1173442a7ff72b220def303 (diff) | |
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_mpeg12.c')
| -rw-r--r-- | libavcodec/vdpau_mpeg12.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/vdpau_mpeg12.c b/libavcodec/vdpau_mpeg12.c index 6a68459fea..a24e2616a4 100644 --- a/libavcodec/vdpau_mpeg12.c +++ b/libavcodec/vdpau_mpeg12.c @@ -75,7 +75,7 @@ static int vdpau_mpeg_start_frame(AVCodecContext *avctx, info->non_intra_quantizer_matrix[i] = s->inter_matrix[i]; } - return ff_vdpau_common_start_frame(pic, buffer, size); + return ff_vdpau_common_start_frame(pic_ctx, buffer, size); } static int vdpau_mpeg_decode_slice(AVCodecContext *avctx, @@ -86,7 +86,7 @@ static int vdpau_mpeg_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; |