Michael Niedermayer 0ed023275f Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  h264: don't touch H264Context->ref_count[] during MB decoding
  x86: get_cpu_flags: add necessary ifdefs around function body
  x86: Drop CPU detection intrinsics
  x86: Add YASM implementations of cpuid and xgetbv from x264

Conflicts:
	configure
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2012-10-05 17:04:15 +02:00

..

asm.h

Merge remote-tracking branch 'qatar/master'

2012-08-09 19:31:56 +02:00

bswap.h

Merge remote-tracking branch 'qatar/master'

2012-06-25 16:55:31 +02:00

cpu.c

Merge remote-tracking branch 'qatar/master'

2012-10-05 17:04:15 +02:00

cpu.h

Merge remote-tracking branch 'qatar/master'

2012-10-05 17:04:15 +02:00

cpuid.asm

Merge remote-tracking branch 'qatar/master'

2012-10-05 17:04:15 +02:00

float_dsp_init.c

Merge remote-tracking branch 'qatar/master'

2012-09-09 13:27:42 +02:00

float_dsp.asm

Merge remote-tracking branch 'qatar/master'

2012-09-08 12:53:44 +02:00

intmath.h

x86: remove FASTDIV inline asm

2012-08-22 14:29:10 +01:00

intreadwrite.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

Makefile

x86: Add YASM implementations of cpuid and xgetbv from x264

2012-10-04 19:29:14 +02:00

timer.h

Merge remote-tracking branch 'qatar/master'

2012-07-08 22:33:32 +02:00

w64xmmtest.h

Add more missing includes after removing the implicit common.h

2012-08-16 10:49:54 +03:00

x86inc.asm

Merge remote-tracking branch 'qatar/master'

2012-08-26 22:40:02 +02:00

x86util.asm

Merge commit 'a1bcc76e6036e78f25cbb7323c145056cfca9d93'

2012-08-24 14:30:40 +02:00