[vlc-commits] stream_filter: rectify PTS delay unit (fix #10748)

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Fri Feb 21 18:48:16 2014 +0200| [273c9cc14b53c49ac27f9d09df5cb67ea4a2e23d] | committer: Rémi Denis-Courmont

stream_filter: rectify PTS delay unit (fix #10748)

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

 modules/stream_filter/dash/dash.cpp   |    5 ++++-
 modules/stream_filter/httplive.c      |    2 +-
 modules/stream_filter/smooth/smooth.c |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/stream_filter/dash/dash.cpp b/modules/stream_filter/dash/dash.cpp
index 3800cf3..bd0bc31 100644
--- a/modules/stream_filter/dash/dash.cpp
+++ b/modules/stream_filter/dash/dash.cpp
@@ -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;
 
diff --git a/modules/stream_filter/httplive.c b/modules/stream_filter/httplive.c
index f9ce835..e763456 100644
--- a/modules/stream_filter/httplive.c
+++ b/modules/stream_filter/httplive.c
@@ -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:
diff --git a/modules/stream_filter/smooth/smooth.c b/modules/stream_filter/smooth/smooth.c
index 3189c32..dcb75ac 100644
--- a/modules/stream_filter/smooth/smooth.c
+++ b/modules/stream_filter/smooth/smooth.c
@@ -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: