summaryrefslogtreecommitdiff
path: root/libavcodec/dvbsubdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-07 23:39:23 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-07 23:39:31 +0100
commit48f37664a8b5bc43fc3dad5784f32ea2267d38a9 (patch)
tree68995eab17b6838013d1c74b13d2ef3debaf1ea9 /libavcodec/dvbsubdec.c
parent175e689cc5defe74d243ca37bcd74b37447d8716 (diff)
parent86f910806b2c303c43727d357a5b927e662bb3d1 (diff)
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/dvbsubdec.c')
-rw-r--r--libavcodec/dvbsubdec.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c
index 4ce40aac83..b8b414343d 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)