Merge commit 'd0aabeab23755ee906440505ad2097c0f1493e80'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Mar 2014 13:16:44 +0000 (14:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Mar 2014 13:17:43 +0000 (14:17 +0100)
commit8e8347b89291ffa65779f1f8c85eed5d57d80a86
treedd907ad7a9fe948b61e72f81202bea2d88cbf363
parentc05065aac0d921c7eeacbc9fd6dcc7eb8e194835
parentd0aabeab23755ee906440505ad2097c0f1493e80
Merge commit 'd0aabeab23755ee906440505ad2097c0f1493e80'

* commit 'd0aabeab23755ee906440505ad2097c0f1493e80':
  x86: h264_qpel: Fix typo in CALL_2X_PIXELS macro invocation

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