* modules/mux/ogg.c, modules/stream_out/transcode.c: better fix for the starting...

diff --git a/modules/mux/ogg.c b/modules/mux/ogg.c
index b2a7f31293d0ad54ad7ca61d054d93a66edf3400..93349048a0a78ffb117baf2c32d1203fd68aa4bd 100644 (file)
--- a/modules/mux/ogg.c
+++ b/modules/mux/ogg.c
@@ -2,7 +2,7 @@
  * ogg.c: ogg muxer module for vlc
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: ogg.c,v 1.16 2003/10/09 18:53:01 gbazin Exp $
+ * $Id: ogg.c,v 1.17 2003/10/09 19:31:38 gbazin Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *          Gildas Bazin <gbazin@netcourrier.com>
@@ -174,7 +174,6 @@ static int MuxGetStream( sout_mux_t *p_mux, int *pi_stream, mtime_t *pi_dts )
             sout_buffer_t *p_buf;
 
             p_buf = sout_FifoShow( p_fifo );
-            if( p_buf->i_dts ) // To ignore vorbis and theora header packets
             if( i_stream < 0 || p_buf->i_dts < i_dts )
             {
                 i_dts = p_buf->i_dts;

diff --git a/modules/stream_out/transcode.c b/modules/stream_out/transcode.c
index 57cb8987463157cccb8332e1ec1b57935a548c8a..53bb67bcdcc1a9432c89fe02b3f9c3379646e69e 100644 (file)
--- a/modules/stream_out/transcode.c
+++ b/modules/stream_out/transcode.c
@@ -2,7 +2,7 @@
  * transcode.c
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: transcode.c,v 1.40 2003/10/09 18:53:01 gbazin Exp $
+ * $Id: transcode.c,v 1.41 2003/10/09 19:31:38 gbazin Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -1004,7 +1004,7 @@ static int transcode_audio_ffmpeg_process( sout_stream_t *p_stream,
                     p_out->i_size = header[i].bytes;
                     p_out->i_length = 0;
 
-                    p_out->i_dts = p_out->i_pts = 0;
+                    p_out->i_dts = p_out->i_pts = id->i_dts;
 
                     sout_BufferChain( out, p_out );
                 }
@@ -1496,6 +1496,8 @@ static int transcode_video_ffmpeg_process( sout_stream_t *p_stream,
                 sout_buffer_t *p_out;
                 p_out = sout_BufferNew( p_stream->p_sout, p_block->i_buffer );
                 memcpy( p_out->p_buffer, p_block->p_buffer, p_block->i_buffer);
+                p_out->i_dts = id->i_dts;
+                p_out->i_pts = id->i_dts;
                 sout_BufferChain( out, p_out );
             }