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/opt.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 'libavutil/opt.c')
-rw-r--r-- | libavutil/opt.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavutil/opt.c b/libavutil/opt.c index 0ff45c8116..e81da47dbf 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -1163,8 +1163,6 @@ void *av_opt_ptr(const AVClass *class, void *obj, const char *name) #ifdef TEST -#undef printf - typedef struct TestContext { const AVClass *class; |