Changeset 6f373d75 in ffmpeg

Timestamp:

Nov 15, 2014, 1:39:49 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

05e0ea60

Parents:

53ab7846 (diff), 2e170405 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (11/15/14 01:28:23)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/15/14 01:39:49)

Message:

Merge commit '2e1704059ae8625beda2ffde847ad22c5ba416dc'

• commit '2e1704059ae8625beda2ffde847ad22c5ba416dc': vf_interlace: Add SIMD for lowpass filter

Conflicts:

libavfilter/vf_interlace.c
libavfilter/x86/Makefile

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)