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 /libavdevice | |
| 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 'libavdevice')
| -rw-r--r-- | libavdevice/libcdio.c | 3 | ||||
| -rw-r--r-- | libavdevice/libdc1394.c | 2 | ||||
| -rw-r--r-- | libavdevice/timefilter.c | 2 |
3 files changed, 0 insertions, 7 deletions
diff --git a/libavdevice/libcdio.c b/libavdevice/libcdio.c index fa311fd657..ec53e2c072 100644 --- a/libavdevice/libcdio.c +++ b/libavdevice/libcdio.c @@ -33,9 +33,6 @@ #include "libavformat/avformat.h" #include "libavformat/internal.h" -/* cdio returns some malloced strings that need to be free()d */ -#undef free - typedef struct CDIOContext { const AVClass *class; cdrom_drive_t *drive; diff --git a/libavdevice/libdc1394.c b/libavdevice/libdc1394.c index bae1497c4b..80cb1bee11 100644 --- a/libavdevice/libdc1394.c +++ b/libavdevice/libdc1394.c @@ -48,8 +48,6 @@ #define DC1394_FRAMERATE_240 FRAMERATE_240 #endif -#undef free - typedef struct dc1394_data { AVClass *class; #if HAVE_LIBDC1394_1 diff --git a/libavdevice/timefilter.c b/libavdevice/timefilter.c index 343f1b1c44..ba2e54e0c0 100644 --- a/libavdevice/timefilter.c +++ b/libavdevice/timefilter.c @@ -90,8 +90,6 @@ double ff_timefilter_eval(TimeFilter *self, double delta) #include "libavutil/lfg.h" #define LFG_MAX ((1LL << 32) - 1) -#undef printf - int main(void) { AVLFG prng; |