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/avstring.c | |
parent | 1fa2bdc90a4a5309a3bf83ff9ae37f59e5f329fa (diff) | |
parent | cb45553f577f8e0ebfe05d3287e1b6fa5859b967 (diff) | |
download | ffmpeg-99efd596267248ba5eae1b0e540d880368a402c3.tar.gz |
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/avstring.c')
-rw-r--r-- | libavutil/avstring.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavutil/avstring.c b/libavutil/avstring.c index 802d0f85e7..f03df67441 100644 --- a/libavutil/avstring.c +++ b/libavutil/avstring.c @@ -214,7 +214,6 @@ int av_strncasecmp(const char *a, const char *b, size_t n) #ifdef TEST #include "common.h" -#undef printf int main(void) { |