vlc | branch: master | Francois Cartegnie <[email protected]> | Mon Jun 20 17:30:10 2016 +0200| [e0981252cc3b573e99a0413adc8b58ba37109c88] | committer: Francois Cartegnie
demux: adaptive: force minimal pts delay > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e0981252cc3b573e99a0413adc8b58ba37109c88 --- modules/demux/adaptive/PlaylistManager.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/modules/demux/adaptive/PlaylistManager.cpp b/modules/demux/adaptive/PlaylistManager.cpp index 1f24777..95a27ef 100644 --- a/modules/demux/adaptive/PlaylistManager.cpp +++ b/modules/demux/adaptive/PlaylistManager.cpp @@ -457,9 +457,16 @@ int PlaylistManager::doControl(int i_query, va_list args) } case DEMUX_GET_PTS_DELAY: - *va_arg (args, int64_t *) = INT64_C(1000) * - var_InheritInteger(p_demux, "network-caching"); - break; + if( logicType != AbstractAdaptationLogic::RateBased ) + { + *va_arg (args, int64_t *) = INT64_C(1000) * + var_InheritInteger(p_demux, "network-caching"); + } + else + { + *va_arg (args, int64_t *) = 1000 * INT64_C(1000); + } + break; default: return VLC_EGENERIC; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
