From cd1b22d8e8945a1feb8bf4c7848352c038d9378e Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Sat, 28 Sep 2013 16:06:08 +0000 Subject: avfilter/dualinput: simplify Signed-off-by: Paul B Mahol --- libavfilter/vf_psnr.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'libavfilter/vf_psnr.c') diff --git a/libavfilter/vf_psnr.c b/libavfilter/vf_psnr.c index c4af4ac7c6..353f5358d0 100644 --- a/libavfilter/vf_psnr.c +++ b/libavfilter/vf_psnr.c @@ -320,16 +320,10 @@ static int config_output(AVFilterLink *outlink) return 0; } -static int filter_frame_main(AVFilterLink *inlink, AVFrame *inpicref) +static int filter_frame(AVFilterLink *inlink, AVFrame *inpicref) { PSNRContext *s = inlink->dst->priv; - return ff_dualinput_filter_frame_main(&s->dinput, inlink, inpicref); -} - -static int filter_frame_ref(AVFilterLink *inlink, AVFrame *inpicref) -{ - PSNRContext *s = inlink->dst->priv; - return ff_dualinput_filter_frame_second(&s->dinput, inlink, inpicref); + return ff_dualinput_filter_frame(&s->dinput, inlink, inpicref); } static int request_frame(AVFilterLink *outlink) @@ -359,11 +353,11 @@ static const AVFilterPad psnr_inputs[] = { { .name = "main", .type = AVMEDIA_TYPE_VIDEO, - .filter_frame = filter_frame_main, + .filter_frame = filter_frame, },{ .name = "reference", .type = AVMEDIA_TYPE_VIDEO, - .filter_frame = filter_frame_ref, + .filter_frame = filter_frame, .config_props = config_input_ref, }, { NULL } -- cgit v1.2.3