]> git.sesse.net Git - vlc/commitdiff
stream_filter: rectify PTS delay unit (fix #10748)
authorRémi Denis-Courmont <remi@remlab.net>
Fri, 21 Feb 2014 16:48:16 +0000 (18:48 +0200)
committerRémi Denis-Courmont <remi@remlab.net>
Fri, 21 Feb 2014 16:51:30 +0000 (18:51 +0200)
modules/stream_filter/dash/dash.cpp
modules/stream_filter/httplive.c
modules/stream_filter/smooth/smooth.c

index 3800cf364d141b308cbe277d5d98bcd8df28377d..bd0bc31228fd58c1c1a0fecee97bb1e786e0bfa1 100644 (file)
@@ -29,6 +29,9 @@
 # include "config.h"
 #endif
 
+#define __STDC_CONSTANT_MACROS 1
+#include <stdint.h>
+
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 
@@ -283,7 +286,7 @@ static int  Control         (stream_t *p_stream, int i_query, va_list args)
             break;
         }
         case STREAM_GET_PTS_DELAY:
-            *va_arg (args, int64_t *) =
+            *va_arg (args, int64_t *) = INT64_C(1000) *
                 var_InheritInteger(p_stream, "network-caching");
              break;
 
index f9ce835d6b476ae9c2a17b348ef02dec43e98b9f..e7634565ae2737130d41ed0fc88fb87169820eed 100644 (file)
@@ -2686,7 +2686,7 @@ static int Control(stream_t *s, int i_query, va_list args)
             *(va_arg (args, uint64_t *)) = GetStreamSize(s);
             break;
         case STREAM_GET_PTS_DELAY:
-            *va_arg (args, int64_t *) =
+            *va_arg (args, int64_t *) = INT64_C(1000) *
                 var_InheritInteger(s, "network-caching");
              break;
         default:
index 3189c32cf6b725ea491cfd27ff4999a36de74034..dcb75acd6995a6a74269b48e4d469917003f1fb3 100644 (file)
@@ -758,7 +758,7 @@ static int Control( stream_t *s, int i_query, va_list args )
             *(va_arg( args, uint64_t * )) = FAKE_STREAM_SIZE;
             break;
         case STREAM_GET_PTS_DELAY:
-            *va_arg (args, int64_t *) =
+            *va_arg (args, int64_t *) = INT64_C(1000) *
                 var_InheritInteger(s, "network-caching");
              break;
         default: