diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-06-27 07:25:58 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-07-06 10:11:55 +0200 |
| commit | 25c2f13d00fcfdb81c33a459795c33d29f8690e8 (patch) | |
| tree | 96b661a3c57a36b71632048391fac9cb4d5b5e36 | |
| parent | 7fbcf1df03db848618f64658f7027d87739d8b3b (diff) | |
| download | ffmpeg-25c2f13d00fcfdb81c33a459795c33d29f8690e8.tar.gz | |
ffmpeg: Fix VDPAU decoding for some H264 samples.
(cherry picked from commit a4ab70f92e4d8705434a2fee42a2b69a8bfa6bb1)
| -rw-r--r-- | libavcodec/vdpau.c | 3 |
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; |