[vlc-commits] live555 : fix regression from 31ac20b22fc37bcf78991159bf8a0f138db05b44

[Sébastien Escudier]

vlc/vlc-1.2 | branch: master | Sébastien Escudier <sebastien-devel at celeos.eu> | Wed Dec 21 14:37:57 2011 +0100| [be3ac0564e720cd3fe8fe36508d3efcc004e0dc8] | committer: Sébastien

live555 : fix regression from 31ac20b22fc37bcf78991159bf8a0f138db05b44
Closes #5707 #5493
(cherry picked from commit 9b0fc851317323cfb0c67247e59f4356e75cb744)

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

 modules/demux/live555.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
index a3357d6..6c01789 100644
--- a/modules/demux/live555.cpp
+++ b/modules/demux/live555.cpp
@@ -1544,7 +1544,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 = INT64_C(1000)
-                  * var_GetInteger( p_demux, "network-caching" );
+                  * var_InheritInteger( p_demux, "network-caching" );
             return VLC_SUCCESS;
 
         default: