[SCM] libav/experimental: Always initialize bit_depth_luma and bit_depth_chroma in the H264 decoder which allows their usage without checking profile_idc.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:57:10 UTC 2013


The following commit has been merged in the experimental branch:
commit b090930d432957a06f78701212b3024f93958f17
Author: Laurent Aimar <fenrir at via.ecp.fr>
Date:   Sat Jan 9 07:57:26 2010 +0000

    Always initialize bit_depth_luma and bit_depth_chroma in the H264
    decoder which allows their usage without checking profile_idc.
    
    Patch by Laurent Aimar (fenrir (AT) videolan org)
    
    Originally committed as revision 21107 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 8f6670c..bc79f66 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -7209,6 +7209,8 @@ int ff_h264_decode_seq_parameter_set(H264Context *h){
         decode_scaling_matrices(h, sps, NULL, 1, sps->scaling_matrix4, sps->scaling_matrix8);
     }else{
         sps->chroma_format_idc= 1;
+        sps->bit_depth_luma   = 8;
+        sps->bit_depth_chroma = 8;
     }
 
     sps->log2_max_frame_num= get_ue_golomb(&s->gb) + 4;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list