Fix segmentation fault at ffmpeg startup (fixes #858)

diff --git a/modules/codec/ffmpeg/ffmpeg.c b/modules/codec/ffmpeg/ffmpeg.c
index f4a7e7347608293ffb58d5feecb199c7b98521a2..4be6efc4435385a32345527dfd274dd8c545d889 100644 (file)
--- a/modules/codec/ffmpeg/ffmpeg.c
+++ b/modules/codec/ffmpeg/ffmpeg.c
@@ -205,9 +205,6 @@ vlc_module_begin();
     set_callbacks( E_(OpenScaler), E_(CloseScaler) );
     add_integer( "swscale-mode", 0, NULL, SCALEMODE_TEXT, SCALEMODE_LONGTEXT, VLC_TRUE );
         change_integer_list( pi_mode_values, ppsz_mode_descriptions, 0 );
-
-    var_Create( p_module->p_libvlc_global, "avcodec", VLC_VAR_MUTEX );
-
 #else
     /* chroma conversion submodule */
     add_submodule();
@@ -235,6 +232,8 @@ vlc_module_begin();
     add_shortcut( "ffmpeg-deinterlace" );
 #endif
 
+    var_Create( p_module->p_libvlc_global, "avcodec", VLC_VAR_MUTEX );
+
 vlc_module_end();
 
 /*****************************************************************************