diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-07 23:39:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-07 23:39:31 +0100 |
| commit | 48f37664a8b5bc43fc3dad5784f32ea2267d38a9 (patch) | |
| tree | 68995eab17b6838013d1c74b13d2ef3debaf1ea9 /libavcodec | |
| parent | 175e689cc5defe74d243ca37bcd74b37447d8716 (diff) | |
| parent | 86f910806b2c303c43727d357a5b927e662bb3d1 (diff) | |
| download | ffmpeg-streaming-48f37664a8b5bc43fc3dad5784f32ea2267d38a9.zip ffmpeg-streaming-48f37664a8b5bc43fc3dad5784f32ea2267d38a9.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Remove #undefs for formerly forbidden system functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/dct-test.c | 2 | ||||
| -rw-r--r-- | libavcodec/dvbsubdec.c | 2 | ||||
| -rw-r--r-- | libavcodec/dvdsubdec.c | 3 |
3 files changed, 0 insertions, 7 deletions
diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c index be00c4b..f323366 100644 --- a/libavcodec/dct-test.c +++ b/libavcodec/dct-test.c @@ -47,8 +47,6 @@ #include "x86/idct_xvid.h" #include "dctref.h" -#undef printf - // BFIN void ff_bfin_idct(int16_t *block); void ff_bfin_fdct(int16_t *block); diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c index 4ce40aa..b8b4143 100644 --- a/libavcodec/dvbsubdec.c +++ b/libavcodec/dvbsubdec.c @@ -34,8 +34,6 @@ #define cm (ff_cropTbl + MAX_NEG_CROP) #ifdef DEBUG -#undef fprintf -#undef perror #if 0 static void png_save(const char *filename, uint8_t *bitmap, int w, int h, uint32_t *rgba_palette) diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c index 87afc1e..3f8c365 100644 --- a/libavcodec/dvdsubdec.c +++ b/libavcodec/dvdsubdec.c @@ -462,9 +462,6 @@ static int find_smallest_bounding_rectangle(AVSubtitle *s) } #ifdef DEBUG -#undef fprintf -#undef perror -#undef exit static void ppm_save(const char *filename, uint8_t *bitmap, int w, int h, uint32_t *rgba_palette) { |
