Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 31 Jan 2013 19:03:29 +0000 (20:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 31 Jan 2013 19:03:36 +0000 (20:03 +0100)
* qatar/master:
  x86: hpel: Move {avg,put}_pixels16_sse2 to hpeldsp
  configure: Add a comment indicating why uclibc is checked before glibc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
libavcodec/x86/dsputil.asm
libavcodec/x86/hpeldsp.asm

diff --cc configure
Simple merge
Simple merge
Simple merge