Browse code

Replace remaining uses of parse_date with av_parse_time.

Signed-off-by: Mans Rullgard <mans@mansr.com>

Anton Khirnov authored on 2011/02/16 17:52:37
Showing 2 changed files
... ...
@@ -2136,9 +2136,8 @@ static int open_input_stream(HTTPContext *c, const char *info)
2136 2136
         buf_size = FFM_PACKET_SIZE;
2137 2137
         /* compute position (absolute time) */
2138 2138
         if (find_info_tag(buf, sizeof(buf), "date", info)) {
2139
-            stream_pos = parse_date(buf, 0);
2140
-            if (stream_pos == INT64_MIN)
2141
-                return -1;
2139
+            if ((ret = av_parse_time(&stream_pos, buf, 0)) < 0)
2140
+                return ret;
2142 2141
         } else if (find_info_tag(buf, sizeof(buf), "buffer", info)) {
2143 2142
             int prebuffer = strtol(buf, 0, 10);
2144 2143
             stream_pos = av_gettime() - prebuffer * (int64_t)1000000;
... ...
@@ -2149,9 +2148,8 @@ static int open_input_stream(HTTPContext *c, const char *info)
2149 2149
         buf_size = 0;
2150 2150
         /* compute position (relative time) */
2151 2151
         if (find_info_tag(buf, sizeof(buf), "date", info)) {
2152
-            stream_pos = parse_date(buf, 1);
2153
-            if (stream_pos == INT64_MIN)
2154
-                return -1;
2152
+            if ((ret = av_parse_time(&stream_pos, buf, 1)) < 0)
2153
+                return ret;
2155 2154
         } else
2156 2155
             stream_pos = 0;
2157 2156
     }
... ...
@@ -22,6 +22,7 @@
22 22
 #include "libavutil/base64.h"
23 23
 #include "libavutil/avstring.h"
24 24
 #include "libavutil/intreadwrite.h"
25
+#include "libavutil/parseutils.h"
25 26
 #include "libavutil/random_seed.h"
26 27
 #include "avformat.h"
27 28
 
... ...
@@ -99,11 +100,11 @@ static void rtsp_parse_range_npt(const char *p, int64_t *start, int64_t *end)
99 99
     *end = AV_NOPTS_VALUE;
100 100
 
101 101
     get_word_sep(buf, sizeof(buf), "-", &p);
102
-    *start = parse_date(buf, 1);
102
+    av_parse_time(start, buf, 1);
103 103
     if (*p == '-') {
104 104
         p++;
105 105
         get_word_sep(buf, sizeof(buf), "-", &p);
106
-        *end = parse_date(buf, 1);
106
+        av_parse_time(end, buf, 1);
107 107
     }
108 108
 //    av_log(NULL, AV_LOG_DEBUG, "Range Start: %lld\n", *start);
109 109
 //    av_log(NULL, AV_LOG_DEBUG, "Range End: %lld\n", *end);