Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Feb 2013 11:41:27 +0000 (12:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Feb 2013 11:41:27 +0000 (12:41 +0100)
commitfa09ad5c9e68bda47efddd357ed4715f7dab563b
tree5b4d724baa255e7871c8c17712b651d2d29b16f6
parentcf10616cc0db272bab9206a2f0f921f965e379da
parent9acd23d655b5e3a3b56f9916480356fe0e48c70c
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: dsputil: Fix h263 loop filter link error in some configurations

Conflicts:
libavcodec/x86/dsputil.asm

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