Taglib: do not write 0 as track position if tracknumber is ""

[vlc] / modules / packetizer / h264.c

diff --git a/modules/packetizer/h264.c b/modules/packetizer/h264.c
index 1042f36c11a7350e6ba1ef4d0d3b1ae939446972..8675bf033a381244e4a937366d9ab1bb26b60b55 100644 (file)
--- a/modules/packetizer/h264.c
+++ b/modules/packetizer/h264.c
@@ -701,7 +701,7 @@ static block_t *ParseNALBlock( decoder_t *p_dec, bool *pb_used_ts, block_t *p_fr
         block_ChainAppend( &p_sys->p_frame, p_frag );
 
     *pb_used_ts = false;
-    if( p_sys->i_frame_dts <= VLC_TS_INVALID && 
+    if( p_sys->i_frame_dts <= VLC_TS_INVALID &&
         p_sys->i_frame_pts <= VLC_TS_INVALID )
     {
         p_sys->i_frame_dts = i_frag_dts;
@@ -916,6 +916,7 @@ static void PutSPS( decoder_t *p_dec, block_t *p_frag )
 
     /* b_frame_mbs_only */
     p_sys->b_frame_mbs_only = bs_read( &s, 1 );
+    p_dec->fmt_out.video.i_height *=  ( 2 - p_sys->b_frame_mbs_only );
     if( p_sys->b_frame_mbs_only == 0 )
     {
         bs_skip( &s, 1 );
@@ -1198,7 +1199,7 @@ static void ParseSei( decoder_t *p_dec, block_t *p_frag )
             bs_t s;
             const int      i_rec = i_size;
             const uint8_t *p_rec = &pb_dec[i_used];
-    
+
             bs_init( &s, p_rec, i_rec );
             int i_recovery_frames = bs_read_ue( &s );
             //bool b_exact_match = bs_read( &s, 1 );