summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <[email protected]>2011-06-27 09:26:48 +0200
committerCarl Eugen Hoyos <[email protected]>2011-06-29 10:10:13 +0200
commitf239b91596cc469560227ae2900891d7610f018c (patch)
treebcee7897b4a493f79e4f32d437fbedf12c093a21
parentd052370c1eb5c50ad2dd2cac1b967699f42c62b0 (diff)
Fix VDPAU decoding for some H264 samples.
(cherry picked from commit e747b091cbc6b41f3531cfdf9d1bdd34606b1df3)
-rw-r--r--libavcodec/vdpau.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c
index 19bd96bc15..9dc2745922 100644
--- a/libavcodec/vdpau.c
+++ b/libavcodec/vdpau.c
@@ -183,7 +183,8 @@ void ff_vdpau_h264_picture_complete(MpegEncContext *s)
render->info.h264.deblocking_filter_control_present_flag = h->pps.deblocking_filter_parameters_present;
render->info.h264.redundant_pic_cnt_present_flag = h->pps.redundant_pic_cnt_present;
memcpy(render->info.h264.scaling_lists_4x4, h->pps.scaling_matrix4, sizeof(render->info.h264.scaling_lists_4x4));
- memcpy(render->info.h264.scaling_lists_8x8, h->pps.scaling_matrix8, sizeof(render->info.h264.scaling_lists_8x8));
+ memcpy(render->info.h264.scaling_lists_8x8[0], h->pps.scaling_matrix8[0], sizeof(render->info.h264.scaling_lists_8x8[0]));
+ memcpy(render->info.h264.scaling_lists_8x8[1], h->pps.scaling_matrix8[3], sizeof(render->info.h264.scaling_lists_8x8[0]));
ff_draw_horiz_band(s, 0, s->avctx->height);
render->bitstream_buffers_used = 0;