Use var_Inherit* instead of var_CreateGet*.

[vlc] / modules / demux / ogg.c

diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c
index 098ba7fc2e57e23ec5860468a106d0d1918fc455..4c50f6d2c8a07447e568957d360e946d74a4e1a7 100644 (file)
--- a/modules/demux/ogg.c
+++ b/modules/demux/ogg.c
@@ -105,7 +105,6 @@ typedef struct
     } sh;
 } stream_header_t;
 
-#define OGG_BLOCK_SIZE 4096
 
 /* Some defines from OggDS */
 #define PACKET_TYPE_HEADER   0x01
@@ -470,9 +469,9 @@ static int Ogg_ReadPage( demux_t *p_demux, ogg_page *p_oggpage )
 
     while( ogg_sync_pageout( &p_ogg->oy, p_oggpage ) != 1 )
     {
-        p_buffer = ogg_sync_buffer( &p_ogg->oy, OGG_BLOCK_SIZE );
+        p_buffer = ogg_sync_buffer( &p_ogg->oy, OGGSEEK_BYTES_TO_READ );
 
-        i_read = stream_Read( p_demux->s, p_buffer, OGG_BLOCK_SIZE );
+        i_read = stream_Read( p_demux->s, p_buffer, OGGSEEK_BYTES_TO_READ );
         if( i_read <= 0 )
             return VLC_EGENERIC;
 
@@ -501,7 +500,7 @@ static void Ogg_UpdatePCR( logical_stream_t *p_stream,
               ( iframe << p_stream->i_granule_shift );
 
             p_stream->i_pcr = ( iframe + pframe - p_stream->i_keyframe_offset )
-             * INT64_C(1000000) / p_stream->f_rate;
+              * INT64_C(1000000) / p_stream->f_rate;
         }
         else if( p_stream->fmt.i_codec == VLC_CODEC_DIRAC )
         {
@@ -978,12 +977,12 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux )
                 }
                 /* Check for Dirac header */
                 else if( ( oggpacket.bytes >= 5 &&
-                          ! memcmp( oggpacket.packet, "BBCD\x00", 5 ) ) ||
-                        ( oggpacket.bytes >= 9 &&
-                          ! memcmp( oggpacket.packet, "KW-DIRAC\x00", 9 ) ) )
-               {
-                   if( Ogg_ReadDiracHeader( p_stream, &oggpacket ) )
-                       msg_Dbg( p_demux, "found dirac header" );
+                           ! memcmp( oggpacket.packet, "BBCD\x00", 5 ) ) ||
+                         ( oggpacket.bytes >= 9 &&
+                           ! memcmp( oggpacket.packet, "KW-DIRAC\x00", 9 ) ) )
+                {
+                    if( Ogg_ReadDiracHeader( p_stream, &oggpacket ) )
+                        msg_Dbg( p_demux, "found dirac header" );
                     else
                     {
                         msg_Warn( p_demux, "found dirac header isn't decodable" );