generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2012-12-05 13:25:23 +01:00
parent 1fa2bdc90a cb45553f57
commit 99efd59626
34 changed files with 20 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavutil/parseutils.c
View File

@@ -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");