vlc/vlc-3.0 | branch: master | Francois Cartegnie <[email protected]> | Wed Sep 
25 15:08:07 2019 +0200| [e3996cefb2d3344773ca7daa00c39f3e456f6963] | committer: 
Francois Cartegnie

packetizer: h264: only use date_t for length computation

(cherry picked from commit f23fab774f10b71530f630d8b6b318991f689d19)

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

 modules/packetizer/h264.c | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/modules/packetizer/h264.c b/modules/packetizer/h264.c
index 96504b3dee..c149d7b5fe 100644
--- a/modules/packetizer/h264.c
+++ b/modules/packetizer/h264.c
@@ -994,17 +994,9 @@ static block_t *OutputPicture( decoder_t *p_dec )
 
     if( p_pic->i_length == 0 )
     {
-        if( p_sps->vui.i_time_scale )
-        {
-            p_pic->i_length = CLOCK_FREQ * i_num_clock_ts *
-                              p_sps->vui.i_num_units_in_tick / 
p_sps->vui.i_time_scale;
-        }
-        else
-        {
-            date_t next = p_sys->dts;
-            date_Increment( &next, i_num_clock_ts );
-            p_pic->i_length = date_Get( &next ) - date_Get( &p_sys->dts );
-        }
+        date_t next = p_sys->dts;
+        date_Increment( &next, i_num_clock_ts );
+        p_pic->i_length = date_Get( &next ) - date_Get( &p_sys->dts );
     }
 
 #if 0

_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to