[vlc-devel] commit: Used VLC_TS_0 in nsv demuxer. (Laurent Aimar )
git version control
git at videolan.org
Mon Dec 21 00:02:33 CET 2009
vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sun Dec 20 21:04:53 2009 +0100| [360fbdaf78440bc06ac21b100c87a24283a3f095] | committer: Laurent Aimar
Used VLC_TS_0 in nsv demuxer.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=360fbdaf78440bc06ac21b100c87a24283a3f095
---
modules/demux/nsv.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/modules/demux/nsv.c b/modules/demux/nsv.c
index a156c1c..887e17b 100644
--- a/modules/demux/nsv.c
+++ b/modules/demux/nsv.c
@@ -118,7 +118,7 @@ static int Open( vlc_object_t *p_this )
es_format_Init( &p_sys->fmt_sub, SPU_ES, 0 );
p_sys->p_sub = NULL;
- p_sys->i_pcr = 1;
+ p_sys->i_pcr = 0;
p_sys->i_time = 0;
p_sys->i_pcr_inc = 0;
@@ -203,7 +203,7 @@ static int Demux( demux_t *p_demux )
}
/* Set PCR */
- es_out_Control( p_demux->out, ES_OUT_SET_PCR, (int64_t)p_sys->i_pcr );
+ es_out_Control( p_demux->out, ES_OUT_SET_PCR, VLC_TS_0 + p_sys->i_pcr );
/* Read video */
i_size = ( header[0] >> 4 ) | ( header[1] << 4 ) | ( header[2] << 12 );
@@ -251,8 +251,8 @@ static int Demux( demux_t *p_demux )
}
/* Skip the first part (it is the language name) */
- p_frame->i_pts = p_sys->i_pcr;
- p_frame->i_dts = p_sys->i_pcr + 4000000; /* 4s */
+ p_frame->i_pts = VLC_TS_0 + p_sys->i_pcr;
+ p_frame->i_dts = VLC_TS_0 + p_sys->i_pcr + 4000000; /* 4s */
es_out_Send( p_demux->out, p_sys->p_sub, p_frame );
}
@@ -272,7 +272,7 @@ static int Demux( demux_t *p_demux )
/* msg_Dbg( p_demux, "frame video size=%d", i_size ); */
if( i_size > 0 && ( p_frame = stream_Block( p_demux->s, i_size ) ) )
{
- p_frame->i_dts = p_sys->i_pcr;
+ p_frame->i_dts = VLC_TS_0 + p_sys->i_pcr;
es_out_Send( p_demux->out, p_sys->p_video, p_frame );
}
}
@@ -300,7 +300,7 @@ static int Demux( demux_t *p_demux )
if( ( p_frame = stream_Block( p_demux->s, i_size ) ) )
{
p_frame->i_dts =
- p_frame->i_pts = p_sys->i_pcr;
+ p_frame->i_pts = VLC_TS_0 + p_sys->i_pcr;
es_out_Send( p_demux->out, p_sys->p_audio, p_frame );
}
}
More information about the vlc-devel
mailing list