[vlc-commits] demux: mjpeg: set the unknown frame length to VLC_TICK_INVALID

Steve Lhomme git at videolan.org
Wed Sep 19 13:23:59 CEST 2018


vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Fri Jun  1 12:49:33 2018 +0200| [1d033714211fa43bcc5c5efa75f79a874d5b543b] | committer: Steve Lhomme

demux: mjpeg: set the unknown frame length to VLC_TICK_INVALID

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

 modules/demux/mjpeg.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/demux/mjpeg.c b/modules/demux/mjpeg.c
index e583a640bb..7b1db17a70 100644
--- a/modules/demux/mjpeg.c
+++ b/modules/demux/mjpeg.c
@@ -267,7 +267,7 @@ static int SendBlock( demux_t *p_demux, int i )
         return VLC_DEMUXER_EOF;
     }
 
-    if( p_sys->i_frame_length )
+    if( p_sys->i_frame_length != VLC_TICK_INVALID )
     {
         p_block->i_pts = p_sys->i_time;
         p_sys->i_time += p_sys->i_frame_length;
@@ -378,7 +378,7 @@ static int Open( vlc_object_t * p_this )
     }
     else
         p_sys->b_still = false;
-    p_sys->i_frame_length = f_fps ? (CLOCK_FREQ / f_fps) : 0;
+    p_sys->i_frame_length = f_fps ? (CLOCK_FREQ / f_fps) : VLC_TICK_INVALID;
 
     es_format_Init( &p_sys->fmt, VIDEO_ES, VLC_CODEC_MJPG );
 



More information about the vlc-commits mailing list