]> git.sesse.net Git - vlc/commitdiff
lavc: kill config_Get
authorRémi Denis-Courmont <remi@remlab.net>
Wed, 30 Dec 2009 19:26:37 +0000 (21:26 +0200)
committerRémi Denis-Courmont <remi@remlab.net>
Wed, 30 Dec 2009 19:50:32 +0000 (21:50 +0200)
modules/codec/avcodec/avcodec.c
modules/codec/avcodec/encoder.c
modules/codec/avcodec/video.c

index 56c818370d67788071d9b2b419cc48d9b6d9e6ae..ba2cbdefb9f8a16b6163bb5cdfb56f7ccef0d13f 100644 (file)
@@ -254,7 +254,7 @@ static int OpenDecoder( vlc_object_t *p_this )
     p_context = avcodec_alloc_context();
     if( !p_context )
         return VLC_ENOMEM;
-    p_context->debug = config_GetInt( p_dec, "ffmpeg-debug" );
+    p_context->debug = var_InheritInteger( p_dec, "ffmpeg-debug" );
     p_context->opaque = (void *)p_this;
 
     /* Set CPU capabilities */
index bc18c378b60316703036850cedd1e772a929ea49..21a4b6a555ee1737c7c3f33b97a06873213eb9e0 100644 (file)
@@ -278,7 +278,7 @@ int OpenEncoder( vlc_object_t *p_this )
 
     p_sys->p_context = p_context = avcodec_alloc_context();
     p_sys->p_context->codec_id = p_sys->p_codec->id;
-    p_context->debug = config_GetInt( p_enc, "ffmpeg-debug" );
+    p_context->debug = var_InheritInteger( p_enc, "ffmpeg-debug" );
     p_context->opaque = (void *)p_this;
 
     /* Set CPU capabilities */
index 4fd33ace58f5067745012ef83bc3cb84a7cff438..578843687a7863f89d90cb4b64df9dc1ea10e6ae 100644 (file)
@@ -216,13 +216,13 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
 
     /*  ***** Get configuration of ffmpeg plugin ***** */
     p_sys->p_context->workaround_bugs =
-        config_GetInt( p_dec, "ffmpeg-workaround-bugs" );
+        var_InheritInteger( p_dec, "ffmpeg-workaround-bugs" );
 #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 52, 0, 0 )
     p_sys->p_context->error_resilience =
-        config_GetInt( p_dec, "ffmpeg-error-resilience" );
+        var_InheritInteger( p_dec, "ffmpeg-error-resilience" );
 #else
     p_sys->p_context->error_recognition =
-        config_GetInt( p_dec, "ffmpeg-error-resilience" );
+        var_InheritInteger( p_dec, "ffmpeg-error-resilience" );
 #endif
 
     if( var_CreateGetBool( p_dec, "grayscale" ) )