[vlc-devel] commit: non BOS headers for (Vorbis, Theora, Speex, Kate) do not have to be on separate pages, so avoid flushing before the last header (ogg.k.ogg.k )

git version control git at videolan.org
Thu Jul 30 14:27:05 CEST 2009


vlc | branch: 1.0-bugfix | ogg.k.ogg.k <ogg.k.ogg.k at googlemail.com> | Wed Jul 29 18:20:26 2009 +0100| [e7f336b4a98cfe3c0b63cdea003bcada9234b8e7] | committer: Jean-Baptiste Kempf 

non BOS headers for (Vorbis, Theora, Speex, Kate) do not have to be on separate pages, so avoid flushing before the last header

Signed-off-by: Laurent Aimar <fenrir at videolan.org>
(cherry picked from commit f87986e401407123a0a940dc8ebf0cc0192e57c7)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/mux/ogg.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/mux/ogg.c b/modules/mux/ogg.c
index bafc4d6..c8145e7 100644
--- a/modules/mux/ogg.c
+++ b/modules/mux/ogg.c
@@ -747,8 +747,12 @@ static block_t *OggCreateHeader( sout_mux_t *p_mux )
                 op.packetno = p_stream->i_packet_no++;
                 ogg_stream_packetin( &p_stream->os, &op );
 
-                p_og = OggStreamFlush( p_mux, &p_stream->os, 0 );
-                block_ChainAppend( &p_hdr, p_og );
+                if( j == 0 )
+                    p_og = OggStreamFlush( p_mux, &p_stream->os, 0 );
+                else
+                    p_og = OggStreamPageOut( p_mux, &p_stream->os, 0 );
+                if( p_og )
+                    block_ChainAppend( &p_hdr, p_og );
             }
         }
         else if( p_stream->i_fourcc != VLC_FOURCC( 'f', 'l', 'a', 'c' ) &&




More information about the vlc-devel mailing list