For consistency, remove references to vlc from libvlc

[vlc] / modules / codec / ffmpeg / ffmpeg.c

diff --git a/modules/codec/ffmpeg/ffmpeg.c b/modules/codec/ffmpeg/ffmpeg.c
index 631849b740451fc94c4c7d5969160ded452e6117..e890d58a5c13279806269332f765f5ed95780c81 100644 (file)
--- a/modules/codec/ffmpeg/ffmpeg.c
+++ b/modules/codec/ffmpeg/ffmpeg.c
@@ -216,7 +216,7 @@ vlc_module_begin();
     set_description( _("FFmpeg deinterlace video filter") );
     add_shortcut( "ffmpeg-deinterlace" );
 
-    var_Create( p_module->p_libvlc, "avcodec", VLC_VAR_MUTEX );
+    var_Create( p_module->p_libvlc_global, "avcodec", VLC_VAR_MUTEX );
 vlc_module_end();
 
 /*****************************************************************************
@@ -266,23 +266,23 @@ static int OpenDecoder( vlc_object_t *p_this )
 
     /* Set CPU capabilities */
     p_context->dsp_mask = 0;
-    if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_MMX) )
+    if( !(p_dec->p_libvlc_global->i_cpu & CPU_CAPABILITY_MMX) )
     {
         p_context->dsp_mask |= FF_MM_MMX;
     }
-    if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_MMXEXT) )
+    if( !(p_dec->p_libvlc_global->i_cpu & CPU_CAPABILITY_MMXEXT) )
     {
         p_context->dsp_mask |= FF_MM_MMXEXT;
     }
-    if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_3DNOW) )
+    if( !(p_dec->p_libvlc_global->i_cpu & CPU_CAPABILITY_3DNOW) )
     {
         p_context->dsp_mask |= FF_MM_3DNOW;
     }
-    if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_SSE) )
+    if( !(p_dec->p_libvlc_global->i_cpu & CPU_CAPABILITY_SSE) )
     {
         p_context->dsp_mask |= FF_MM_SSE;
     }
-    if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_SSE2) )
+    if( !(p_dec->p_libvlc_global->i_cpu & CPU_CAPABILITY_SSE2) )
     {
         p_context->dsp_mask |= FF_MM_SSE2;
     }
@@ -318,7 +318,7 @@ static void CloseDecoder( vlc_object_t *p_this )
     decoder_sys_t *p_sys = p_dec->p_sys;
     vlc_value_t lockval;
 
-    var_Get( p_dec->p_libvlc, "avcodec", &lockval );
+    var_Get( p_dec->p_libvlc_global, "avcodec", &lockval );
 
     switch( p_sys->i_cat )
     {
@@ -407,7 +407,7 @@ void E_(InitLibavcodec)( vlc_object_t *p_object )
     static int b_ffmpeginit = 0;
     vlc_value_t lockval;
 
-    var_Get( p_object->p_libvlc, "avcodec", &lockval );
+    var_Get( p_object->p_libvlc_global, "avcodec", &lockval );
     vlc_mutex_lock( lockval.p_address );
 
     /* *** init ffmpeg library (libavcodec) *** */
@@ -792,11 +792,28 @@ static struct
       VIDEO_ES, "Creative YUV Video" },
 
     /* On2 VP3 Video Codecs */
+    { VLC_FOURCC('V','P','3',' '), CODEC_ID_VP3,
+      VIDEO_ES, "On2's VP3 Video" },
+    { VLC_FOURCC('V','P','3','0'), CODEC_ID_VP3,
+      VIDEO_ES, "On2's VP3 Video" },
     { VLC_FOURCC('V','P','3','1'), CODEC_ID_VP3,
       VIDEO_ES, "On2's VP3 Video" },
     { VLC_FOURCC('v','p','3','1'), CODEC_ID_VP3,
       VIDEO_ES, "On2's VP3 Video" },
 
+#if LIBAVCODEC_BUILD >= ((51<<16)+(14<<8)+0)
+    { VLC_FOURCC('V','P','5',' '), CODEC_ID_VP5,
+      VIDEO_ES, "On2's VP5 Video" },
+    { VLC_FOURCC('V','P','5','0'), CODEC_ID_VP5,
+      VIDEO_ES, "On2's VP5 Video" },
+    { VLC_FOURCC('V','P','6','2'), CODEC_ID_VP6,
+      VIDEO_ES, "On2's VP6.2 Video" },
+    { VLC_FOURCC('v','p','6','2'), CODEC_ID_VP6,
+      VIDEO_ES, "On2's VP6.2 Video" },
+    { VLC_FOURCC('V','P','6','F'), CODEC_ID_VP6F,
+      VIDEO_ES, "On2's VP6.2 Video (Flash)" },
+#endif
+
 #if LIBAVCODEC_BUILD >= 4685
     /* Xiph.org theora */
     { VLC_FOURCC('t','h','e','o'), CODEC_ID_THEORA,