ffmpeg/libavresample
Michael Niedermayer 2fc7c818cb 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>
2012-08-07 23:04:55 +02:00
..
x86 x86: add colons after labels 2012-08-07 15:20:56 +01:00
Makefile
audio_convert.c
audio_convert.h
audio_data.c
audio_data.h
audio_mix.c lavr: fix handling of custom mix matrices 2012-08-04 10:28:22 -04:00
audio_mix.h
audio_mix_matrix.c lavr: fix handling of custom mix matrices 2012-08-04 10:28:22 -04:00
avresample-test.c
avresample.h
internal.h
libavresample.v
options.c
resample.c
resample.h
resample_template.c
utils.c Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
version.h