X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fogg.c;h=54c9c7834601b60927f22a68873a834d0c4fbff6;hb=015a372b105406afcbf4ca5995ea62115c1c65bf;hp=5e42ad572dd1bb15e8ef0e12d56501a39ace65bb;hpb=0d2c5a89d709b33f089cda4380a7546d1f0b61d0;p=vlc

diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c
index 5e42ad572d..54c9c78346 100644
--- a/modules/demux/ogg.c
+++ b/modules/demux/ogg.c
@@ -201,6 +201,20 @@ static int Open( vlc_object_t * p_this )
     /* Begnning of stream, tell the demux to look for elementary streams. */
     p_sys->i_eos = 0;
 
+
+    if( ((input_thread_t* )(p_demux->p_parent ))->b_preparsing == VLC_TRUE )
+    {
+        module_t *p_meta = module_Need( p_demux, "meta reader", NULL, 0 );
+        if( p_meta )
+        {
+            vlc_meta_Merge( ((input_thread_t* )(p_demux->p_parent ))->
+                                                input.p_item->p_meta,
+                                (vlc_meta_t*)(p_demux->p_private ) );
+            module_Unneed( p_demux, p_meta );
+        }
+        return VLC_SUCCESS;
+    }
+
     /* Initialize the Ogg physical bitstream parser */
     ogg_sync_init( &p_sys->oy );
 
@@ -1360,12 +1374,12 @@ static void Ogg_ReadAnnodexHeader( vlc_object_t *p_this,
         /* we are guaranteed that the first header field will be
          * the content-type (by the Annodex standard) */
         content_type_string[0] = '\0';
-        if( !strncasecmp( &p_oggpacket->packet[28], "Content-Type: ", 14 ) )
+        if( !strncasecmp( (char*)(&p_oggpacket->packet[28]), "Content-Type: ", 14 ) )
         {
             uint8_t *p = memchr( &p_oggpacket->packet[42], '\r',
                                  p_oggpacket->bytes - 1 );
             if( p && p[0] == '\r' && p[1] == '\n' )
-                sscanf( &p_oggpacket->packet[42], "%1024s\r\n",
+                sscanf( (char*)(&p_oggpacket->packet[42]), "%1024s\r\n",
                         content_type_string );
         }