Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Feb 2013 13:35:36 +0000 (14:35 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Feb 2013 13:35:49 +0000 (14:35 +0100)
commit54d8322355c0b9dafe89f57fa9b2d4e5cf3b51af
tree313c6d08aa1d0d3896471209085b1bb8e257d25e
parentc7002e3d3dad3e026ec304066de65b5a21910067
parenta1d36730342edf7281e5992a7f8aafabc2464ed0
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dsputil: x86: Fix compile error
  dsputil: x86: Convert h263 loop filter to yasm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/x86/dsputil.asm
libavcodec/x86/dsputil_mmx.c