From d7db42d27f0a474a0ef0de8a771d3e4d5344e3ed Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 3 Feb 2018 13:23:07 +0100 Subject: swresample: minor simplification Cosmetic and no change in behavior. At least I think this looks simpler. --- filters/f_swresample.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'filters') diff --git a/filters/f_swresample.c b/filters/f_swresample.c index 2bb1e4cd02..49f69cbbd7 100644 --- a/filters/f_swresample.c +++ b/filters/f_swresample.c @@ -666,15 +666,14 @@ static void process(struct mp_filter *f) struct mp_frame out = filter_resample_output(p, p->input); - if (p->input && out.type) { + if (out.type) { mp_pin_in_write(f->ppins[1], out); - } else if (!p->input && out.type) { - mp_pin_in_write(f->ppins[1], out); - mp_pin_out_repeat_eof(f->ppins[0]); - } else if (!p->input) { - mp_pin_in_write(f->ppins[1], MP_EOF_FRAME); - } else { + if (!p->input) + mp_pin_out_repeat_eof(f->ppins[0]); + } else if (p->input) { mp_filter_internal_mark_progress(f); // try to consume more input + } else { + mp_pin_in_write(f->ppins[1], MP_EOF_FRAME); } if (p->input && !mp_aframe_get_size(p->input)) -- cgit v1.2.3