[FFmpeg-cvslog] Merge commit 'ca5c3ff90972a5c97aabda2ace57ba72dcd7d83b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov 25 12:31:21 2014 +0100| [3fe3c8abb15a98a118b3476d6847d6a6d436399b] | committer: Michael Niedermayer

Merge commit 'ca5c3ff90972a5c97aabda2ace57ba72dcd7d83b'

* commit 'ca5c3ff90972a5c97aabda2ace57ba72dcd7d83b':
  vf_interlace: x86: improve asm performance

Conflicts:
	libavfilter/x86/vf_interlace.asm

See: 05e4b25e9b0a3586033dc21548b03c8e5071efe3
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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