From: Steinar H. Gunderson <steinar+vlc@gunderson.no>
Date: Sat, 2 Oct 2010 00:15:07 +0000 (+0200)
Subject: Don't create decklink-caching, just inherit it and it will get implicitly created.
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=c8abb446b484d6be1895fce49d3d242142ae344b;hp=d66255d540dfac647c8a7d8aded8522a02b3ca2d;p=vlc

Don't create decklink-caching, just inherit it and it will get implicitly created.
---

diff --git a/modules/access/decklink.cpp b/modules/access/decklink.cpp
index 3f837f22f0..60e8b831a4 100644
--- a/modules/access/decklink.cpp
+++ b/modules/access/decklink.cpp
@@ -576,9 +576,6 @@ static int Open( vlc_object_t *p_this )
              (char*)&audio_fmt.i_codec, audio_fmt.audio.i_rate, audio_fmt.audio.i_bitspersample, audio_fmt.audio.i_channels);
     p_sys->p_audio_es = es_out_Add( p_demux->out, &audio_fmt );
 
-    /* Update default_pts to a suitable value for access */
-    var_Create( p_demux, "decklink-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
-
     ret = VLC_SUCCESS;
 
 finish:
@@ -645,7 +642,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
 
         case DEMUX_GET_PTS_DELAY:
             pi64 = (int64_t*)va_arg( args, int64_t * );
-            *pi64 = var_GetInteger( p_demux, "decklink-caching" ) * 1000;
+            *pi64 = var_InheritInteger( p_demux, "decklink-caching" ) * 1000;
             return VLC_SUCCESS;
 
         case DEMUX_GET_TIME: