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 /libavfilter | |
| 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 'libavfilter')
| -rw-r--r-- | libavfilter/filtfmts.c | 3 | ||||
| -rw-r--r-- | libavfilter/vf_drawtext.c | 2 | ||||
| -rw-r--r-- | libavfilter/vf_mp.c | 2 |
3 files changed, 1 insertions, 6 deletions
diff --git a/libavfilter/filtfmts.c b/libavfilter/filtfmts.c index 14417cbd4b..72867292a9 100644 --- a/libavfilter/filtfmts.c +++ b/libavfilter/filtfmts.c @@ -26,9 +26,6 @@ #include "libavfilter/avfilter.h" #include "libavfilter/formats.h" -#undef fprintf -#undef printf - static void print_formats(AVFilterContext *filter_ctx) { int i, j; diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index 43f9844def..ecc53275b1 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -47,8 +47,6 @@ #include "internal.h" #include "video.h" -#undef time - #include <ft2build.h> #include <freetype/config/ftheader.h> #include FT_FREETYPE_H diff --git a/libavfilter/vf_mp.c b/libavfilter/vf_mp.c index 5217e032f6..a18c342756 100644 --- a/libavfilter/vf_mp.c +++ b/libavfilter/vf_mp.c @@ -581,7 +581,7 @@ int vf_next_put_image(struct vf_instance *vf,mp_image_t *mpi, double pts){ goto fail; picref->buf = pic; - picref->buf->please_use_av_free= (void*)av_free; + picref->buf->free= (void*)av_free; if (!(picref->video = av_mallocz(sizeof(AVFilterBufferRefVideoProps)))) goto fail; |