Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 7 Aug 2012 21:04:55 +0000 (23:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 7 Aug 2012 21:04:55 +0000 (23:04 +0200)
commit2fc7c818cb7b7bfdca69d17ab9f1b48290dbc3f6
tree23a8f9c41f97be5cf9cdfd406575fa9ac9461b75
parent2da5a5ce00caebbe3afbda8612588966cfeac477
parentedd82267958fbbd34eca4f4dbfb96197b9b40ab5
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: fix build with nasm 2.08
  x86: use nop cpu directives only if supported
  x86: fix rNmp macros with nasm
  build: add trailing / to yasm/nasm -I flags
  x86: use 32-bit source registers with movd instruction
  x86: add colons after labels

Conflicts:
Makefile
libavutil/x86/x86inc.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
17 files changed:
common.mak
configure
libavcodec/x86/deinterlace.asm
libavcodec/x86/dsputil_yasm.asm
libavcodec/x86/dsputilenc_yasm.asm
libavcodec/x86/fft_mmx.asm
libavcodec/x86/fmtconvert.asm
libavcodec/x86/h264_chromamc.asm
libavcodec/x86/h264_deblock_10bit.asm
libavcodec/x86/h264_idct.asm
libavcodec/x86/h264_idct_10bit.asm
libavcodec/x86/h264_intrapred.asm
libavcodec/x86/h264_weight.asm
libavcodec/x86/vp56dsp.asm
libavcodec/x86/vp8dsp.asm
libavutil/x86/float_dsp.asm
libavutil/x86/x86inc.asm