diff options
| author | Jason Garrett-Glaser <jason@x264.com> | 2011-06-21 01:10:37 -0700 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-23 00:17:03 +0200 |
| commit | 26f732e21df7f79dbff040737b6030fd9a5ada11 (patch) | |
| tree | 7de03a0e1ed2320acef075fcd9bc0c2f45f34cb4 | |
| parent | 82b2dd5ee483c46c7ab26c0ead33b89594c9f6c0 (diff) | |
| download | ffmpeg-26f732e21df7f79dbff040737b6030fd9a5ada11.tar.gz | |
H.264: reference the correct SPS in decode_scaling_matrices
(cherry picked from commit 85a88f9c0c0fcc2fc48121db1beb5ada68d24bdc)
| -rw-r--r-- | libavcodec/h264_ps.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index ddfe1d2c64..75a0af7fff 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -281,12 +281,12 @@ static void decode_scaling_matrices(H264Context *h, SPS *sps, PPS *pps, int is_s decode_scaling_list(h,scaling_matrix4[5],16,default_scaling4[1],scaling_matrix4[4]); // Inter, Cb if(is_sps || pps->transform_8x8_mode){ decode_scaling_list(h,scaling_matrix8[0],64,default_scaling8[0],fallback[2]); // Intra, Y - if(h->sps.chroma_format_idc == 3){ + if(sps->chroma_format_idc == 3){ decode_scaling_list(h,scaling_matrix8[1],64,default_scaling8[0],scaling_matrix8[0]); // Intra, Cr decode_scaling_list(h,scaling_matrix8[2],64,default_scaling8[0],scaling_matrix8[1]); // Intra, Cb } decode_scaling_list(h,scaling_matrix8[3],64,default_scaling8[1],fallback[3]); // Inter, Y - if(h->sps.chroma_format_idc == 3){ + if(sps->chroma_format_idc == 3){ decode_scaling_list(h,scaling_matrix8[4],64,default_scaling8[1],scaling_matrix8[3]); // Inter, Cr decode_scaling_list(h,scaling_matrix8[5],64,default_scaling8[1],scaling_matrix8[4]); // Inter, Cb } |