On 12/23/15, James Almer <jamrial at gmail.com> wrote: > Signed-off-by: James Almer <jamrial at gmail.com> > --- > libavfilter/x86/vf_maskedmerge.asm | 29 ++++++++++++++++++----------- > libavfilter/x86/vf_maskedmerge_init.c | 2 +- > 2 files changed, 19 insertions(+), 12 deletions(-) > ok if tested