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)
* commit 'ca5c3ff90972a5c97aabda2ace57ba72dcd7d83b':
  vf_interlace: x86: improve asm performance

Conflicts:
libavfilter/x86/vf_interlace.asm

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

Simple merge