summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <[email protected]>2011-06-27 07:25:58 +0000
committerReinhard Tartler <[email protected]>2011-07-12 18:05:55 +0200
commitb9e126fbe2510523dece2fe5433cdd00ab52f2f5 (patch)
tree0e43eddfc4e2f0d87ecd00e0dc50e8cf041bd44d
parent07dc4a79c701a4fd41d0973df1ab56333895faed (diff)
ffmpeg: Fix VDPAU decoding for some H264 samples.
(cherry picked from commit a4ab70f92e4d8705434a2fee42a2b69a8bfa6bb1)
-rw-r--r--libavcodec/vdpau.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c
index 5f8f09186e..5312b4b852 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;