[vlc-commits] packetizer: h264: renamed hrd parameter flag

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Sat Jun 11 13:55:01 2016 +0200| [983caa91446a5f9dc0aa3cda55a51272410b8470] | committer: Francois Cartegnie

packetizer: h264: renamed hrd parameter flag

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=983caa91446a5f9dc0aa3cda55a51272410b8470
---

 modules/packetizer/h264.c     |    2 +-
 modules/packetizer/h264_nal.c |    6 +++---
 modules/packetizer/h264_nal.h |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/packetizer/h264.c b/modules/packetizer/h264.c
index ba890f4..f46ea28 100644
--- a/modules/packetizer/h264.c
+++ b/modules/packetizer/h264.c
@@ -769,7 +769,7 @@ static void PutSPS( decoder_t *p_dec, block_t *p_frag )
         p_sys->i_time_scale = p_sps->vui.i_time_scale;
         p_sys->b_fixed_frame_rate = p_sps->vui.b_fixed_frame_rate;
         p_sys->b_pic_struct_present_flag = p_sps->vui.b_pic_struct_present_flag;
-        p_sys->b_cpb_dpb_delays_present_flag = p_sps->vui.b_cpb_dpb_delays_present_flag;
+        p_sys->b_cpb_dpb_delays_present_flag = p_sps->vui.b_hrd_parameters_present_flag;
         p_sys->i_cpb_removal_delay_length_minus1 = p_sps->vui.i_cpb_removal_delay_length_minus1;
         p_sys->i_dpb_output_delay_length_minus1 = p_sps->vui.i_dpb_output_delay_length_minus1;
 
diff --git a/modules/packetizer/h264_nal.c b/modules/packetizer/h264_nal.c
index 3be76cd..c68c8ff 100644
--- a/modules/packetizer/h264_nal.c
+++ b/modules/packetizer/h264_nal.c
@@ -474,13 +474,13 @@ static bool h264_parse_sequence_parameter_set_rbsp( bs_t *p_bs,
         }
 
         /* Nal hrd & VC1 hrd parameters */
-        p_sps->vui.b_cpb_dpb_delays_present_flag = false;
+        p_sps->vui.b_hrd_parameters_present_flag = false;
         for ( int i=0; i<2; i++ )
         {
             i_tmp = bs_read( p_bs, 1 );
             if( i_tmp )
             {
-                p_sps->vui.b_cpb_dpb_delays_present_flag = true;
+                p_sps->vui.b_hrd_parameters_present_flag = true;
                 uint32_t count = bs_read_ue( p_bs ) + 1;
                 bs_read( p_bs, 4 );
                 bs_read( p_bs, 4 );
@@ -497,7 +497,7 @@ static bool h264_parse_sequence_parameter_set_rbsp( bs_t *p_bs,
             }
         }
 
-        if( p_sps->vui.b_cpb_dpb_delays_present_flag )
+        if( p_sps->vui.b_hrd_parameters_present_flag )
             bs_read( p_bs, 1 );
 
         /* pic struct info */
diff --git a/modules/packetizer/h264_nal.h b/modules/packetizer/h264_nal.h
index e97739d..0c4a911 100644
--- a/modules/packetizer/h264_nal.h
+++ b/modules/packetizer/h264_nal.h
@@ -129,7 +129,7 @@ struct h264_sequence_parameter_set_t
         uint32_t i_time_scale;
         bool b_fixed_frame_rate;
         bool b_pic_struct_present_flag;
-        bool b_cpb_dpb_delays_present_flag;
+        bool b_hrd_parameters_present_flag;
         uint8_t i_cpb_removal_delay_length_minus1;
         uint8_t i_dpb_output_delay_length_minus1;
     } vui;