Merge commit '96fda42a8f9bf84beaaf7f5991d17f2a057de86c'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 27 Nov 2014 22:46:12 +0000 (23:46 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 27 Nov 2014 22:46:45 +0000 (23:46 +0100)
commit449bd3c0c33c2ea52ae232d149d0207d53f34a88
tree0ad287284bd10b805af5fbd6afa4afe8422c7921
parent6db8cd8f37b72c5397541a9689a5378bf1a559ce
parent96fda42a8f9bf84beaaf7f5991d17f2a057de86c
Merge commit '96fda42a8f9bf84beaaf7f5991d17f2a057de86c'

* commit '96fda42a8f9bf84beaaf7f5991d17f2a057de86c':
  vf_interlace: get rid of useless loads

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