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/blowfish.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/blowfish.c')
| -rw-r--r-- | libavutil/blowfish.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavutil/blowfish.c b/libavutil/blowfish.c index cdc2952dea..5ad74c10fd 100644 --- a/libavutil/blowfish.c +++ b/libavutil/blowfish.c @@ -420,7 +420,6 @@ void av_blowfish_crypt(AVBlowfish *ctx, uint8_t *dst, const uint8_t *src, #ifdef TEST #include <stdio.h> -#undef printf #define NUM_VARIABLE_KEY_TESTS 34 @@ -523,7 +522,6 @@ static const uint8_t ciphertext2[16] = { #define IV "blowfish" -#undef exit static void test_blowfish(AVBlowfish *ctx, uint8_t *dst, const uint8_t *src, const uint8_t *ref, int len, uint8_t *iv, int dir, const char *test) |