diff options
| author | wm4 <nfxjfg@googlemail.com> | 2014-03-20 08:53:17 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2014-03-20 17:00:39 +0100 |
| commit | 1b1094a19d9e41baf3253c83841f9e5343cecbd0 (patch) | |
| tree | efd0f854f2f84824f2af500452a9232a8f714f0c /libavcodec/vdpau_h264.c | |
| parent | 7948a51b5c3d08e1a1173442a7ff72b220def303 (diff) | |
| download | ffmpeg-1b1094a19d9e41baf3253c83841f9e5343cecbd0.tar.gz | |
vdpau: switch ff_vdpau_get_surface_id from Picture to AVFrame
This gets rid of aliasing completely unrelated structs to Picture.
Fixes the remaining compilation warnings in the vdpau code.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavcodec/vdpau_h264.c')
| -rw-r--r-- | libavcodec/vdpau_h264.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/vdpau_h264.c b/libavcodec/vdpau_h264.c index c71d6b8db3..7aa17efc29 100644 --- a/libavcodec/vdpau_h264.c +++ b/libavcodec/vdpau_h264.c @@ -50,7 +50,7 @@ static void vdpau_h264_clear_rf(VdpReferenceFrameH264 *rf) static void vdpau_h264_set_rf(VdpReferenceFrameH264 *rf, H264Picture *pic, int pic_structure) { - VdpVideoSurface surface = ff_vdpau_get_surface_id(pic); + VdpVideoSurface surface = ff_vdpau_get_surface_id(&pic->f); if (pic_structure == 0) pic_structure = pic->reference; @@ -87,7 +87,7 @@ static void vdpau_h264_set_reference_frames(AVCodecContext *avctx) if (!pic || !pic->reference) continue; pic_frame_idx = pic->long_ref ? pic->pic_id : pic->frame_num; - surface_ref = ff_vdpau_get_surface_id(pic); + surface_ref = ff_vdpau_get_surface_id(&pic->f); rf2 = &info->referenceFrames[0]; while (rf2 != rf) { @@ -193,7 +193,7 @@ static int vdpau_h264_end_frame(AVCodecContext *avctx) H264Context *h = avctx->priv_data; H264Picture *pic = h->cur_pic_ptr; struct vdpau_picture_context *pic_ctx = pic->hwaccel_picture_private; - VdpVideoSurface surf = ff_vdpau_get_surface_id(pic); + VdpVideoSurface surf = ff_vdpau_get_surface_id(&pic->f); hwctx->render(hwctx->decoder, surf, (void *)&pic_ctx->info, pic_ctx->bitstream_buffers_used, pic_ctx->bitstream_buffers); |