[vlc-devel] commit: Used VLC_TS_0 in raw h264 demuxer. (Laurent Aimar )

git version control git at videolan.org
Mon Dec 21 00:02:41 CET 2009


vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sun Dec 20 22:56:38 2009 +0100| [63768163aa18f33d195d2c442a1404dc9cc05d86] | committer: Laurent Aimar 

Used VLC_TS_0 in raw h264 demuxer.

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

 modules/demux/mpeg/h264.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/demux/mpeg/h264.c b/modules/demux/mpeg/h264.c
index bb681cf..a0e57b8 100644
--- a/modules/demux/mpeg/h264.c
+++ b/modules/demux/mpeg/h264.c
@@ -102,7 +102,7 @@ static int Open( vlc_object_t * p_this )
     p_demux->pf_control= Control;
     p_demux->p_sys     = p_sys = malloc( sizeof( demux_sys_t ) );
     p_sys->p_es        = NULL;
-    p_sys->i_dts       = 1;
+    p_sys->i_dts       = 0;
     p_sys->f_fps       = var_CreateGetFloat( p_demux, "h264-fps" );
     if( p_sys->f_fps < 0.001 )
         p_sys->f_fps = 0.001;
@@ -148,8 +148,8 @@ static int Demux( demux_t *p_demux)
     }
 
     /* m4v demuxer doesn't set pts/dts at all */
-    p_block_in->i_dts = 1;
-    p_block_in->i_pts = 1;
+    p_block_in->i_dts = VLC_TS_0;
+    p_block_in->i_pts = VLC_TS_0;
 
     while( (p_block_out = p_sys->p_packetizer->pf_packetize( p_sys->p_packetizer, &p_block_in )) )
     {
@@ -166,8 +166,8 @@ static int Demux( demux_t *p_demux)
             }
 
             es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_dts );
-            p_block_out->i_dts = p_sys->i_dts;
-            p_block_out->i_pts = p_sys->i_dts;
+            p_block_out->i_dts = VLC_TS_0 + p_sys->i_dts;
+            p_block_out->i_pts = VLC_TS_0 + p_sys->i_dts;
 
             es_out_Send( p_demux->out, p_sys->p_es, p_block_out );
 




More information about the vlc-devel mailing list