X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fvc1.c;h=99b8f934e05a722a2efdcfd071bd7858d5eb1d0a;hb=09f090b183244f2f30ce63af054c1c1439b332ab;hp=05d044218c59f128dfb7699351de655e0cded54d;hpb=d1d3dc1d109110bf68cb048c429f6f05a3839200;p=vlc

diff --git a/modules/demux/vc1.c b/modules/demux/vc1.c
index 05d044218c..99b8f934e0 100644
--- a/modules/demux/vc1.c
+++ b/modules/demux/vc1.c
@@ -29,7 +29,8 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_demux.h>
 #include "vlc_codec.h"
 
@@ -42,16 +43,16 @@ static void Close( vlc_object_t * );
 #define FPS_TEXT N_("Frames per Second")
 #define FPS_LONGTEXT N_("Desired frame rate for the VC-1 stream.")
 
-vlc_module_begin();
-    set_shortname( "VC-1");
-    set_category( CAT_INPUT );
-    set_subcategory( SUBCAT_INPUT_DEMUX );
-    set_description( _("VC1 video demuxer" ) );
-    set_capability( "demux", 0 );
-    add_float( "vc1-fps", 25.0, NULL, FPS_TEXT, FPS_LONGTEXT, true );
-    set_callbacks( Open, Close );
-    add_shortcut( "vc1" );
-vlc_module_end();
+vlc_module_begin ()
+    set_shortname( "VC-1")
+    set_category( CAT_INPUT )
+    set_subcategory( SUBCAT_INPUT_DEMUX )
+    set_description( N_("VC1 video demuxer" ) )
+    set_capability( "demux", 0 )
+    add_float( "vc1-fps", 25.0, NULL, FPS_TEXT, FPS_LONGTEXT, true )
+    set_callbacks( Open, Close )
+    add_shortcut( "vc1" )
+vlc_module_end ()
 
 /*****************************************************************************
  * Local prototypes
@@ -78,7 +79,7 @@ static int Open( vlc_object_t * p_this )
     demux_t     *p_demux = (demux_t*)p_this;
     demux_sys_t *p_sys;
     const uint8_t *p_peek;
-    vlc_value_t val;
+    es_format_t fmt;
 
     if( stream_Peek( p_demux->s, &p_peek, 5 ) < 5 ) return VLC_EGENERIC;
 
@@ -102,13 +103,17 @@ static int Open( vlc_object_t * p_this )
     p_sys->p_es        = NULL;
     p_sys->i_dts       = 1;
     p_sys->f_fps = var_CreateGetFloat( p_demux, "vc1-fps" );
-    if( val.f_float < 0.001 ) p_sys->f_fps = 0.0;
+    if( p_sys->f_fps < 0.001 )
+        p_sys->f_fps = 0.0;
 
     /* Load the packetizer */
-    INIT_VPACKETIZER( p_sys->p_packetizer,  'W', 'V', 'C', '1'  );
-    es_format_Init( &p_sys->p_packetizer->fmt_out, UNKNOWN_ES, 0 );
-    LOAD_PACKETIZER_OR_FAIL( p_sys->p_packetizer, "VC-1" );
-
+    es_format_Init( &fmt, VIDEO_ES, VLC_FOURCC( 'W', 'V', 'C', '1' ) );
+    p_sys->p_packetizer = demux_PacketizerNew( p_demux, &fmt, "VC-1" );
+    if( !p_sys->p_packetizer )
+    {
+        free( p_sys );
+        return VLC_EGENERIC;
+    }
     return VLC_SUCCESS;
 }
 
@@ -120,8 +125,7 @@ static void Close( vlc_object_t * p_this )
     demux_t     *p_demux = (demux_t*)p_this;
     demux_sys_t *p_sys = p_demux->p_sys;
 
-    DESTROY_PACKETIZER( p_sys->p_packetizer );
-
+    demux_PacketizerDestroy( p_sys->p_packetizer );
     free( p_sys );
 }