When using contribs, don't set --with-a52-tree or --with-libmpeg2-tree

[vlc] / modules / codec / vorbis.c

diff --git a/modules/codec/vorbis.c b/modules/codec/vorbis.c
index 018a1f8c5d8d91e54473ac53c2d7a5b53f3b5723..9555be013217fd9abfb5e1fb466356e6e2c7807f 100644 (file)
--- a/modules/codec/vorbis.c
+++ b/modules/codec/vorbis.c
@@ -31,7 +31,8 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_codec.h>
 #include <vlc_aout.h>
 #include <vlc_input.h>
@@ -185,7 +186,7 @@ static block_t *Encode   ( encoder_t *, aout_buffer_t * );
 
 vlc_module_begin();
     set_shortname( "Vorbis" );
-    set_description( _("Vorbis audio decoder") );
+    set_description( N_("Vorbis audio decoder") );
 #ifdef MODULE_NAME_IS_tremor
     set_capability( "decoder", 90 );
 #else
@@ -196,14 +197,14 @@ vlc_module_begin();
     set_callbacks( OpenDecoder, CloseDecoder );
 
     add_submodule();
-    set_description( _("Vorbis audio packetizer") );
+    set_description( N_("Vorbis audio packetizer") );
     set_capability( "packetizer", 100 );
     set_callbacks( OpenPacketizer, CloseDecoder );
 
 #ifndef MODULE_NAME_IS_tremor
 #   define ENC_CFG_PREFIX "sout-vorbis-"
     add_submodule();
-    set_description( _("Vorbis audio encoder") );
+    set_description( N_("Vorbis audio encoder") );
     set_capability( "encoder", 100 );
 #if defined(HAVE_VORBIS_VORBISENC_H)
     set_callbacks( OpenEncoder, CloseEncoder );
@@ -222,7 +223,7 @@ vlc_module_begin();
 vlc_module_end();
 
 #ifndef MODULE_NAME_IS_tremor
-static const char *ppsz_enc_options[] = {
+static const char *const ppsz_enc_options[] = {
     "quality", "max-bitrate", "min-bitrate", "cbr", NULL
 };
 #endif
@@ -243,10 +244,7 @@ static int OpenDecoder( vlc_object_t *p_this )
     /* Allocate the memory needed to store the decoder's structure */
     if( ( p_dec->p_sys = p_sys =
           (decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL )
-    {
-        msg_Err( p_dec, "out of memory" );
-        return VLC_EGENERIC;
-    }
+        return VLC_ENOMEM;
 
     /* Misc init */
     aout_DateSet( &p_sys->end_date, 0 );
@@ -653,10 +651,6 @@ static void ParseVorbisComments( decoder_t *p_dec )
                 if( psz_value && ( *psz_value != '\0' ) )
                 {
                     input_item_SetArtist( p_item, psz_value );
-                    input_ItemAddInfo( p_item,
-                                        _(VLC_META_INFO_CAT),
-                                        _(VLC_META_ARTIST),
-                                        "%s", psz_value );
                 }
             }
             else if( !strcasecmp( psz_name, "title" ) )
@@ -730,7 +724,8 @@ static void ParseVorbisComments( decoder_t *p_dec )
                 r->pf_peak[AUDIO_REPLAY_GAIN_ALBUM] = atof( psz_value );
             }
         }
-        var_SetInteger( pl_Get( p_input ), "item-change", p_item->i_id );
+        var_SetInteger( pl_Yield( p_input ), "item-change", p_item->i_id );
+        pl_Release( p_input );
         free( psz_comment );
         i++;
     }
@@ -876,10 +871,7 @@ static int OpenEncoder( vlc_object_t *p_this )
 
     /* Allocate the memory needed to store the decoder's structure */
     if( ( p_sys = (encoder_sys_t *)malloc(sizeof(encoder_sys_t)) ) == NULL )
-    {
-        msg_Err( p_enc, "out of memory" );
-        return VLC_EGENERIC;
-    }
+        return VLC_ENOMEM;
     p_enc->p_sys = p_sys;
 
     p_enc->pf_encode_audio = Encode;