summaryrefslogtreecommitdiff
path: root/libavutil/base64.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-12-05 13:25:23 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-12-05 13:34:45 +0100
commit99efd596267248ba5eae1b0e540d880368a402c3 (patch)
tree1ab9b0250d1350ffaae7d5f2bf98ba78e21d0cf4 /libavutil/base64.c
parent1fa2bdc90a4a5309a3bf83ff9ae37f59e5f329fa (diff)
parentcb45553f577f8e0ebfe05d3287e1b6fa5859b967 (diff)
downloadffmpeg-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/base64.c')
-rw-r--r--libavutil/base64.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/libavutil/base64.c b/libavutil/base64.c
index d907805c7f..98b9c94d8a 100644
--- a/libavutil/base64.c
+++ b/libavutil/base64.c
@@ -175,8 +175,6 @@ char *av_base64_encode(char *out, int out_size, const uint8_t *in, int in_size)
#ifdef TEST
// LCOV_EXCL_START
-#undef printf
-
#define MAX_DATA_SIZE 1024
#define MAX_ENCODED_SIZE 2048