Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavutil / parseutils.c

diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c
index f188e815fa3b4a37209f899458e652ae38124513..ca40569e6ae629e8c807d800a0c6df26d7a7967d 100644 (file)
--- a/libavutil/parseutils.c
+++ b/libavutil/parseutils.c
@@ -31,8 +31,6 @@
 #include "random_seed.h"
 #include "parseutils.h"
 
-#undef time
-
 #ifdef TEST
 
 #define av_get_random_seed av_get_random_seed_deterministic
@@ -676,15 +674,13 @@ int av_find_info_tag(char *arg, int arg_size, const char *tag1, const char *info
 
 #ifdef TEST
 
-static uint32_t random = MKTAG('L','A','V','U');
+static uint32_t randomv = MKTAG('L','A','V','U');
 
 static uint32_t av_get_random_seed_deterministic(void)
 {
-    return random = random * 1664525 + 1013904223;
+    return randomv = randomv * 1664525 + 1013904223;
 }
 
-#undef printf
-
 int main(void)
 {
     printf("Testing av_parse_video_rate()\n");