[FFmpeg-devel] [PATCHv2] vf_interlace: Add SIMD for lowpass filter

[Michael Niedermayer]

On Wed, Nov 12, 2014 at 01:19:20PM +0100, Michael Niedermayer wrote:
> On Tue, Nov 11, 2014 at 06:43:42PM +0000, Kieran Kunhya wrote:
> > ---
> >  libavfilter/interlace.h             | 59 +++++++++++++++++++++++++++++
> >  libavfilter/vf_interlace.c          | 55 +++++++++++++--------------
> >  libavfilter/x86/Makefile            |  2 +
> >  libavfilter/x86/vf_interlace.asm    | 75 +++++++++++++++++++++++++++++++++++++
> >  libavfilter/x86/vf_interlace_init.c | 42 +++++++++++++++++++++
> >  5 files changed, 204 insertions(+), 29 deletions(-)
> >  create mode 100644 libavfilter/interlace.h
> >  create mode 100644 libavfilter/x86/vf_interlace.asm
> >  create mode 100644 libavfilter/x86/vf_interlace_init.c
> 
> Applying: vf_interlace: Add SIMD for lowpass filter
> Using index info to reconstruct a base tree...
> Falling back to patching base and 3-way merge...
> Auto-merging libavfilter/x86/Makefile
> CONFLICT (content): Merge conflict in libavfilter/x86/Makefile
> Auto-merging libavfilter/vf_interlace.c
> CONFLICT (content): Merge conflict in libavfilter/vf_interlace.c
> Failed to merge in the changes.
> Patch failed at 0001 vf_interlace: Add SIMD for lowpass filter
> When you have resolved this problem run "git am --resolved".
> If you would prefer to skip this patch, instead run "git am --skip".
> To restore the original branch and stop patching run "git am --abort".
> 
> can you submit a patch which applies cleanly, so that people can test
> it and so that we can ensure that it works correctly and has been
> tested with current FFmpeg git master ?

patch merged

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Those who are best at talking, realize last or never when they are wrong.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20141115/23474bc7/attachment.asc>