[FFmpeg-cvslog] H.264: reference the correct SPS in decode_scaling_matrices

Jason Garrett-Glaser git at videolan.org
Tue Jul 26 00:53:16 CEST 2011


ffmpeg | branch: release/0.8 | Jason Garrett-Glaser <jason at x264.com> | Tue Jun 21 01:10:37 2011 -0700| [4c8b14c37ff292ca9d4a412984e5132a27a83858] | committer: Reinhard Tartler

H.264: reference the correct SPS in decode_scaling_matrices

(cherry picked from commit 85a88f9c0c0fcc2fc48121db1beb5ada68d24bdc)

Signed-off-by: Reinhard Tartler <siretart at tauware.de>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4c8b14c37ff292ca9d4a412984e5132a27a83858
---

 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 9c41e4c..5ca2361 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
             }



More information about the ffmpeg-cvslog mailing list