Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 11 Nov 2012 11:17:57 +0000 (12:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 11 Nov 2012 11:18:05 +0000 (12:18 +0100)
* qatar/master:
  x86: h264_qpel_10bit: drop unused parameter from MC10/MC20/MC30 macros

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

Trivial merge