Split Avutil<->VLC chroma conversions functions from avcodec.h so that swscale doesn...

[vlc] / modules / demux / playlist / b4s.c

diff --git a/modules/demux/playlist/b4s.c b/modules/demux/playlist/b4s.c
index ac33bc7debcf1b5a5ee4b963d9990632c9f43a30..9558c63a53638883035f3f3eee6fe33618c34cae 100644 (file)
--- a/modules/demux/playlist/b4s.c
+++ b/modules/demux/playlist/b4s.c
@@ -37,7 +37,6 @@
 
 struct demux_sys_t
 {
-    char *psz_prefix;
 };
 
 /*****************************************************************************
@@ -54,7 +53,6 @@ int Import_B4S( vlc_object_t *p_this )
 {
     DEMUX_BY_EXTENSION_OR_FORCED_MSG( ".b4s", "b4s-open",
                                       "using B4S playlist reader" );
-    p_demux->p_sys->psz_prefix = FindPrefix( p_demux );
     return VLC_SUCCESS;
 }
 
@@ -66,7 +64,6 @@ void Close_B4S( vlc_object_t *p_this )
     demux_t *p_demux = (demux_t *)p_this;
     demux_sys_t *p_sys = p_demux->p_sys;
 
-    free( p_sys->psz_prefix );
     free( p_sys );
 }
 
@@ -199,7 +196,7 @@ static int Demux( demux_t *p_demux )
                     }
                     else
                     {
-                        msg_Warn( p_demux, "unexpected attribure %s in element %s",
+                        msg_Warn( p_demux, "unexpected attribute %s in element %s",
                                   psz_name, psz_elname );
                         free( psz_value );
                     }
@@ -294,10 +291,7 @@ end:
     free( psz_elname );
 
     if( p_subitems )
-    {
-        input_item_AddSubItemTree( p_subitems );
-        input_item_node_Delete( p_subitems );
-    }
+        input_item_node_PostAndDelete( p_subitems );
 
     vlc_gc_decref( p_current_input );
     if( p_xml_reader )