Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 26 Nov 2012 01:04:02 +0000 (02:04 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 26 Nov 2012 01:17:02 +0000 (02:17 +0100)
commit7b29b07394c6d5741f1419c0b8007cc9f7308359
treead2a6f8e54a1a43506edf4e19bf22e1c2b14412f
parent7d2156aee8b6909f71940e7f1c1e9e7062b5cf40
parente96d90eed66a198566c409958432d282e1b03869
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  remove #defines to prevent use of discouraged external functions
  x86: h264: Convert 8-bit QPEL inline assembly to YASM

Conflicts:
libavcodec/x86/dsputil_mmx.c

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