Merge commit 'ca5c3ff90972a5c97aabda2ace57ba72dcd7d83b'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Nov 2014 11:31:21 +0000 (12:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Nov 2014 11:31:45 +0000 (12:31 +0100)
commit3fe3c8abb15a98a118b3476d6847d6a6d436399b
tree347a85bb17b0da357b6ae147b8d402d8e381f324
parent8c9945285e30ed5f7be3b29b0e24f13bde5e5b66
parentca5c3ff90972a5c97aabda2ace57ba72dcd7d83b
Merge commit 'ca5c3ff90972a5c97aabda2ace57ba72dcd7d83b'

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

Conflicts:
libavfilter/x86/vf_interlace.asm

See: 05e4b25e9b0a3586033dc21548b03c8e5071efe3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/x86/vf_interlace.asm