aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/vdpau.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-04-29 15:44:21 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-04-29 16:35:24 +0200
commit36f862e04c2afe37c1fd541e01013c6cef4c6015 (patch)
tree3983371af49a7234d87bf999b35b17875db09a64 /libavcodec/vdpau.c
parent07a79cf8694ac685ae8f579ccc33d113eb46fe3d (diff)
parenta0f2946068c62e18cb05ac25c0df3d86077251a6 (diff)
downloadffmpeg-36f862e04c2afe37c1fd541e01013c6cef4c6015.tar.gz
Merge commit 'a0f2946068c62e18cb05ac25c0df3d86077251a6'
* commit 'a0f2946068c62e18cb05ac25c0df3d86077251a6': h264: use properly allocated AVFrames Conflicts: libavcodec/h264.c libavcodec/h264.h libavcodec/h264_refs.c libavcodec/h264_slice.c libavcodec/svq3.c libavcodec/vda_h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vdpau.c')
-rw-r--r--libavcodec/vdpau.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c
index 1656995666..0c3893507e 100644
--- a/libavcodec/vdpau.c
+++ b/libavcodec/vdpau.c
@@ -364,7 +364,7 @@ void ff_vdpau_h264_set_reference_frames(H264Context *h)
H264Picture *pic;
int i, list, pic_frame_idx;
- render = (struct vdpau_render_state *)h->cur_pic_ptr->f.data[0];
+ render = (struct vdpau_render_state *)h->cur_pic_ptr->f->data[0];
assert(render);
rf = &render->info.h264.referenceFrames[0];
@@ -380,7 +380,7 @@ void ff_vdpau_h264_set_reference_frames(H264Context *h)
continue;
pic_frame_idx = pic->long_ref ? pic->pic_id : pic->frame_num;
- render_ref = (struct vdpau_render_state *)pic->f.data[0];
+ render_ref = (struct vdpau_render_state *)pic->f->data[0];
assert(render_ref);
rf2 = &render->info.h264.referenceFrames[0];
@@ -448,7 +448,7 @@ void ff_vdpau_h264_picture_start(H264Context *h)
struct vdpau_render_state *render;
int i;
- render = (struct vdpau_render_state *)h->cur_pic_ptr->f.data[0];
+ render = (struct vdpau_render_state *)h->cur_pic_ptr->f->data[0];
assert(render);
for (i = 0; i < 2; ++i) {
@@ -465,7 +465,7 @@ void ff_vdpau_h264_picture_complete(H264Context *h)
{
struct vdpau_render_state *render;
- render = (struct vdpau_render_state *)h->cur_pic_ptr->f.data[0];
+ render = (struct vdpau_render_state *)h->cur_pic_ptr->f->data[0];
assert(render);
render->info.h264.slice_count = h->current_slice;