diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-05 16:25:23 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-05 16:34:45 +0400 |
| commit | 99efd596267248ba5eae1b0e540d880368a402c3 (patch) | |
| tree | 1ab9b0250d1350ffaae7d5f2bf98ba78e21d0cf4 /libavdevice/libdc1394.c | |
| parent | 1fa2bdc90a4a5309a3bf83ff9ae37f59e5f329fa (diff) | |
| parent | cb45553f577f8e0ebfe05d3287e1b6fa5859b967 (diff) | |
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/libdc1394.c')
| -rw-r--r-- | libavdevice/libdc1394.c | 2 |
1 files changed, 0 insertions, 2 deletions
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 |