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

1
libavutil/cpu.c
View File

@@ -175,7 +175,6 @@ int av_parse_cpu_caps(unsigned *flags, const char *s)
}
#ifdef TEST
#undef printf
#include <stdio.h>
static const struct {