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 /libavformat | |
| 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 'libavformat')
| -rw-r--r-- | libavformat/network.c | 2 | ||||
| -rw-r--r-- | libavformat/seek-test.c | 3 | ||||
| -rw-r--r-- | libavformat/url-test.c | 3 | ||||
| -rw-r--r-- | libavformat/utils.c | 2 |
4 files changed, 0 insertions, 10 deletions
diff --git a/libavformat/network.c b/libavformat/network.c index 6e924bed66..64bd0ed9ed 100644 --- a/libavformat/network.c +++ b/libavformat/network.c @@ -60,8 +60,6 @@ static unsigned long openssl_thread_id(void) #if HAVE_THREADS && GNUTLS_VERSION_NUMBER <= 0x020b00 #include <gcrypt.h> #include <errno.h> -#undef malloc -#undef free GCRY_THREAD_OPTION_PTHREAD_IMPL; #endif #endif diff --git a/libavformat/seek-test.c b/libavformat/seek-test.c index 49ac3ac06d..34ac4deff2 100644 --- a/libavformat/seek-test.c +++ b/libavformat/seek-test.c @@ -28,9 +28,6 @@ #include "libavutil/mathematics.h" #include "libavformat/avformat.h" -#undef printf -#undef fprintf - static char buffer[20]; static const char *ret_str(int v) diff --git a/libavformat/url-test.c b/libavformat/url-test.c index ceaffe8e9a..ee5f06e9ee 100644 --- a/libavformat/url-test.c +++ b/libavformat/url-test.c @@ -20,9 +20,6 @@ #include "internal.h" -#undef printf -#undef exit - static void test(const char *base, const char *rel) { char buf[200], buf2[200]; diff --git a/libavformat/utils.c b/libavformat/utils.c index 1ad0eaef5e..0f13304cd9 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3530,7 +3530,6 @@ static void hex_dump_internal(void *avcl, FILE *f, int level, const uint8_t *buf, int size) { int len, i, j, c; -#undef fprintf #define PRINT(...) do { if (!f) av_log(avcl, level, __VA_ARGS__); else fprintf(f, __VA_ARGS__); } while(0) for(i=0;i<size;i+=16) { @@ -3568,7 +3567,6 @@ void av_hex_dump_log(void *avcl, int level, const uint8_t *buf, int size) static void pkt_dump_internal(void *avcl, FILE *f, int level, AVPacket *pkt, int dump_payload, AVRational time_base) { -#undef fprintf #define PRINT(...) do { if (!f) av_log(avcl, level, __VA_ARGS__); else fprintf(f, __VA_ARGS__); } while(0) PRINT("stream #%d:\n", pkt->stream_index); PRINT(" keyframe=%d\n", ((pkt->flags & AV_PKT_FLAG_KEY) != 0)); |