From c9e183b490add7e3712974fec85db6c86c13b671 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Sat, 16 Jun 2012 09:47:46 +0000 Subject: lavfi: update some deprecated functions Signed-off-by: Paul B Mahol --- libavfilter/vf_colormatrix.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'libavfilter/vf_colormatrix.c') diff --git a/libavfilter/vf_colormatrix.c b/libavfilter/vf_colormatrix.c index fa20b6a..80814de 100644 --- a/libavfilter/vf_colormatrix.c +++ b/libavfilter/vf_colormatrix.c @@ -31,6 +31,8 @@ #include #include #include "avfilter.h" +#include "formats.h" +#include "video.h" #include "libavutil/pixdesc.h" #include "libavutil/avstring.h" @@ -325,7 +327,7 @@ static int query_formats(AVFilterContext *ctx) PIX_FMT_NONE }; - avfilter_set_common_pixel_formats(ctx, avfilter_make_format_list(pix_fmts)); + ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); return 0; } @@ -333,7 +335,7 @@ static int query_formats(AVFilterContext *ctx) static AVFilterBufferRef *get_video_buffer(AVFilterLink *inlink, int perms, int w, int h) { AVFilterBufferRef *picref = - avfilter_get_video_buffer(inlink->dst->outputs[0], perms, w, h); + ff_get_video_buffer(inlink->dst->outputs[0], perms, w, h); return picref; } @@ -343,7 +345,7 @@ static void start_frame(AVFilterLink *link, AVFilterBufferRef *picref) link->dst->outputs[0]->out_buf = outpicref; - avfilter_start_frame(link->dst->outputs[0], outpicref); + ff_start_frame(link->dst->outputs[0], outpicref); } static void end_frame(AVFilterLink *link) @@ -359,8 +361,8 @@ static void end_frame(AVFilterLink *link) else process_frame_uyvy422(color, out, link->cur_buf); - avfilter_draw_slice(ctx->outputs[0], 0, link->dst->outputs[0]->h, 1); - avfilter_end_frame(ctx->outputs[0]); + ff_draw_slice(ctx->outputs[0], 0, link->dst->outputs[0]->h, 1); + ff_end_frame(ctx->outputs[0]); avfilter_unref_buffer(link->cur_buf); } -- cgit v1.1