Skip to content

V
vlc-1.1
Commit c7357344 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Fix segmentation fault at ffmpeg startup (fixes #858)

parent 90e3a296
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
modules/codec/ffmpeg/ffmpeg.c
View file @ c7357344
...@@ -205,9 +205,6 @@ vlc_module_begin(); ...@@ -205,9 +205,6 @@ vlc_module_begin();
set_callbacks( E_(OpenScaler), E_(CloseScaler) ); set_callbacks( E_(OpenScaler), E_(CloseScaler) );
add_integer( "swscale-mode", 0, NULL, SCALEMODE_TEXT, SCALEMODE_LONGTEXT, VLC_TRUE ); add_integer( "swscale-mode", 0, NULL, SCALEMODE_TEXT, SCALEMODE_LONGTEXT, VLC_TRUE );
change_integer_list( pi_mode_values, ppsz_mode_descriptions, 0 ); change_integer_list( pi_mode_values, ppsz_mode_descriptions, 0 );
var_Create( p_module->p_libvlc_global, "avcodec", VLC_VAR_MUTEX );
#else #else
/* chroma conversion submodule */ /* chroma conversion submodule */
add_submodule(); add_submodule();
...@@ -235,6 +232,8 @@ vlc_module_begin(); ...@@ -235,6 +232,8 @@ vlc_module_begin();
add_shortcut( "ffmpeg-deinterlace" ); add_shortcut( "ffmpeg-deinterlace" );
#endif #endif
var_Create( p_module->p_libvlc_global, "avcodec", VLC_VAR_MUTEX );
vlc_module_end(); vlc_module_end();
/***************************************************************************** /*****************************************************************************
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment