diff options
author | Paul B Mahol <onemda@gmail.com> | 2013-09-28 16:06:08 +0000 |
---|---|---|
committer | Paul B Mahol <onemda@gmail.com> | 2013-09-30 08:47:40 +0000 |
commit | cd1b22d8e8945a1feb8bf4c7848352c038d9378e (patch) | |
tree | bd066df57c0bfe8573d9e348527796e1564876f5 /libavfilter/vf_psnr.c | |
parent | 5c7d86cbde71c3db566194096300ce052e026c38 (diff) | |
download | ffmpeg-streaming-cd1b22d8e8945a1feb8bf4c7848352c038d9378e.zip ffmpeg-streaming-cd1b22d8e8945a1feb8bf4c7848352c038d9378e.tar.gz |
avfilter/dualinput: simplify
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavfilter/vf_psnr.c')
-rw-r--r-- | libavfilter/vf_psnr.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/libavfilter/vf_psnr.c b/libavfilter/vf_psnr.c index c4af4ac..353f535 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 } |