[FFmpeg-cvslog] Merge commit '2e1704059ae8625beda2ffde847ad22c5ba416dc'

Michael Niedermayer git at videolan.org
Sat Nov 15 02:44:39 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Nov 15 02:28:23 2014 +0100| [6f373d75e8923ceb0c6b248b55f65f06dcf69101] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6f373d75e8923ceb0c6b248b55f65f06dcf69101
---





More information about the ffmpeg-cvslog mailing list