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)
commitbec37935ec28ad8d5c22a8adc977d833e8b1963c
tree2438c19710c794d142809fd3d66e44596961c2f8
parent514910fb2d3b373fd80a5c6e6568e16490631378
parent6cd796049dc06eabe1a9714290713bd31024af9e
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: h264_qpel_10bit: drop unused parameter from MC10/MC20/MC30 macros

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