[FFmpeg-devel] [PATCH 2/3] lavfi: add dual input helpers.

[Stefano Sabatini]

On date Saturday 2013-05-25 17:10:56 +0200, Clément Bœsch encoded:
> ---
>  libavfilter/Makefile     |   2 +-
>  libavfilter/dualinput.c  | 159 +++++++++++++++++++++++++++++++++++++++++++++++
>  libavfilter/dualinput.h  |  46 ++++++++++++++
>  libavfilter/vf_overlay.c | 155 +++++++--------------------------------------
>  4 files changed, 227 insertions(+), 135 deletions(-)
>  create mode 100644 libavfilter/dualinput.c
>  create mode 100644 libavfilter/dualinput.h
> 
> diff --git a/libavfilter/Makefile b/libavfilter/Makefile
> index f53afb2..9682cba 100644
> --- a/libavfilter/Makefile
> +++ b/libavfilter/Makefile
> @@ -157,7 +157,7 @@ OBJS-$(CONFIG_NOISE_FILTER)                  += vf_noise.o
>  OBJS-$(CONFIG_NULL_FILTER)                   += vf_null.o
>  OBJS-$(CONFIG_OCV_FILTER)                    += vf_libopencv.o
>  OBJS-$(CONFIG_OPENCL)                        += deshake_opencl.o unsharp_opencl.o
> -OBJS-$(CONFIG_OVERLAY_FILTER)                += vf_overlay.o
> +OBJS-$(CONFIG_OVERLAY_FILTER)                += vf_overlay.o dualinput.o
>  OBJS-$(CONFIG_OWDENOISE_FILTER)              += vf_owdenoise.o
>  OBJS-$(CONFIG_PAD_FILTER)                    += vf_pad.o
>  OBJS-$(CONFIG_PERMS_FILTER)                  += f_perms.o
> diff --git a/libavfilter/dualinput.c b/libavfilter/dualinput.c
> new file mode 100644
> index 0000000..10e3652
> --- /dev/null
> +++ b/libavfilter/dualinput.c
> @@ -0,0 +1,159 @@
> +/*
> + * This file is part of FFmpeg.
> + *
> + * FFmpeg is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Lesser General Public
> + * License as published by the Free Software Foundation; either
> + * version 2.1 of the License, or (at your option) any later version.
> + *
> + * FFmpeg is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> + * Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public
> + * License along with FFmpeg; if not, write to the Free Software
> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
> + */
> +
> +#define MAIN  0
> +#define SECOND 1
> +
> +#include "dualinput.h"
> +#include "libavutil/timestamp.h"
> +

> +static int try_filter_frame(FFDualInputContext *s,

Nit: meaningful name?

[...]

Should be good, assuming that the code was moved with only cosmetical
changes, that it is working and there are no regressions.
-- 
FFmpeg = Fabulous Faithless Magic Portentous Erratic Game