Clean up a bit swscaler (prepare for YUVA/YUVP/RGBA scaling)

[vlc] / modules / access / vcdx / vcd.c

diff --git a/modules/access/vcdx/vcd.c b/modules/access/vcdx/vcd.c
index b89b5e797eec5d9b210a0ca5f115b705b32dae83..e4d525f8bd31dd68b5d8bada2dd933b60f68af14 100644 (file)
--- a/modules/access/vcdx/vcd.c
+++ b/modules/access/vcdx/vcd.c
@@ -33,7 +33,9 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_charset.h>
 
 /*****************************************************************************
  * Exported prototypes
@@ -42,14 +44,14 @@ int  VCDOpen       ( vlc_object_t * );
 void VCDClose      ( vlc_object_t * );
 int  VCDOpenIntf   ( vlc_object_t * );
 void VCDCloseIntf  ( vlc_object_t * );
-int  E_(VCDInit)   ( vlc_object_t * );
-void E_(VCDEnd)    ( vlc_object_t * );
+int  VCDInit   ( vlc_object_t * );
+void VCDEnd    ( vlc_object_t * );
 
-int  E_(DebugCallback) ( vlc_object_t *p_this, const char *psz_name,
+int  DebugCallback ( vlc_object_t *p_this, const char *psz_name,
                          vlc_value_t oldval, vlc_value_t val,
                          void *p_data );
 
-int  E_(BlocksPerReadCallback) ( vlc_object_t *p_this, const char *psz_name,
+int  BlocksPerReadCallback ( vlc_object_t *p_this, const char *psz_name,
                  vlc_value_t oldval, vlc_value_t val,
                  void *p_data );
 
@@ -96,8 +98,8 @@ int  E_(BlocksPerReadCallback) ( vlc_object_t *p_this, const char *psz_name,
  *****************************************************************************/
 
 vlc_module_begin();
-    set_shortname( _("(Super) Video CD"));
-    set_description( _("Video CD (VCD 1.0, 1.1, 2.0, SVCD, HQVCD) input") );
+    set_shortname( N_("(Super) Video CD"));
+    set_description( N_("Video CD (VCD 1.0, 1.1, 2.0, SVCD, HQVCD) input") );
     add_usage_hint( N_("vcdx://[device-or-file][@{P,S,T}num]") );
     add_shortcut( "vcdx" );
     set_category( CAT_INPUT );