[vlc-devel] commit: lavc: kill config_Get ( Rémi Denis-Courmont )

git version control git at videolan.org
Wed Dec 30 20:52:21 CET 2009


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Dec 30 21:26:37 2009 +0200| [890ec5e24952081e51962f6c006850b929241b77] | committer: Rémi Denis-Courmont 

lavc: kill config_Get

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=890ec5e24952081e51962f6c006850b929241b77
---

 modules/codec/avcodec/avcodec.c |    2 +-
 modules/codec/avcodec/encoder.c |    2 +-
 modules/codec/avcodec/video.c   |    6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/codec/avcodec/avcodec.c b/modules/codec/avcodec/avcodec.c
index 56c8183..ba2cbde 100644
--- a/modules/codec/avcodec/avcodec.c
+++ b/modules/codec/avcodec/avcodec.c
@@ -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 */
diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c
index bc18c37..21a4b6a 100644
--- a/modules/codec/avcodec/encoder.c
+++ b/modules/codec/avcodec/encoder.c
@@ -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 */
diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index 4fd33ac..5788436 100644
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -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" ) )




More information about the vlc-devel mailing list