Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'libavfilter')
-rw-r--r--libavfilter/filtfmts.c3
-rw-r--r--libavfilter/vf_drawtext.c2
-rw-r--r--libavfilter/vf_mp.c2
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;