avcodec: add fourcc's for some of the avcodec supported subtitles

[vlc] / modules / codec / twolame.c

diff --git a/modules/codec/twolame.c b/modules/codec/twolame.c
index f3d5b2f908783096a40dffc238187e24280a0a19..0f300efb7273cb010d3e588937544395a59c80be 100644 (file)
--- a/modules/codec/twolame.c
+++ b/modules/codec/twolame.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
 #include <vlc_sout.h>
@@ -66,14 +66,14 @@ static block_t *Encode   ( encoder_t *, aout_buffer_t * );
 #define ENC_PSY_LONGTEXT N_( \
   "Integer from -1 (no model) to 4." )
 
-static int pi_stereo_values[] = { 0, 1, 2 };
-static char *ppsz_stereo_descriptions[] =
+static const int pi_stereo_values[] = { 0, 1, 2 };
+static const char *const ppsz_stereo_descriptions[] =
 { N_("Stereo"), N_("Dual mono"), N_("Joint stereo") };
 
 
 vlc_module_begin();
     set_shortname( "Twolame");
-    set_description( _("Libtwolame audio encoder") );
+    set_description( N_("Libtwolame audio encoder") );
     set_capability( "encoder", 50 );
     set_callbacks( OpenEncoder, CloseEncoder );
     set_category( CAT_INPUT );
@@ -83,14 +83,14 @@ vlc_module_begin();
                ENC_QUALITY_LONGTEXT, false );
     add_integer( ENC_CFG_PREFIX "mode", 0, NULL, ENC_MODE_TEXT,
                  ENC_MODE_LONGTEXT, false );
-        change_integer_list( pi_stereo_values, ppsz_stereo_descriptions, 0 );
+        change_integer_list( pi_stereo_values, ppsz_stereo_descriptions, NULL );
     add_bool( ENC_CFG_PREFIX "vbr", 0, NULL, ENC_VBR_TEXT,
               ENC_VBR_LONGTEXT, false );
     add_integer( ENC_CFG_PREFIX "psy", 3, NULL, ENC_PSY_TEXT,
                  ENC_PSY_LONGTEXT, false );
 vlc_module_end();
 
-static const char *ppsz_enc_options[] = {
+static const char *const ppsz_enc_options[] = {
     "quality", "mode", "vbr", "psy", NULL
 };