Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 27 Jan 2013 15:47:50 +0000 (16:47 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 27 Jan 2013 15:47:56 +0000 (16:47 +0100)
commit2b14344ab36efca915475a91feb744f8f4101cd5
tree4756159c406422ab206a00924401bc0636f07c11
parentf5c0b9aa6f3843d33961981aa16317d05d74e9dc
parent2026eb1408a718c37835eb4b258c63714ab3205e
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  arm: vp8: Fix the plain-armv6 version of vp8_luma_dc_wht

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