diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-05 13:25:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-05 13:34:45 +0100 |
| commit | 99efd596267248ba5eae1b0e540d880368a402c3 (patch) | |
| tree | 1ab9b0250d1350ffaae7d5f2bf98ba78e21d0cf4 /libavutil/parseutils.c | |
| parent | 1fa2bdc90a4a5309a3bf83ff9ae37f59e5f329fa (diff) | |
| parent | cb45553f577f8e0ebfe05d3287e1b6fa5859b967 (diff) | |
Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'
* commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967':
Remove pointless #undefs of previously forbidden functions.
fate: Add dependencies for bmp, cdxl, dfa, mp3
Conflicts:
doc/examples/muxing.c
libavfilter/filtfmts.c
libavutil/des.c
libavutil/eval.c
libavutil/log.c
libavutil/parseutils.c
tests/fate/mp3.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/parseutils.c')
| -rw-r--r-- | libavutil/parseutils.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c index f188e815fa..ca40569e6a 100644 --- 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"); |