Michael Niedermayer 31d0d35560 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  x86inc: Remove .rodata kludges

Conflicts:
	libavutil/x86/x86inc.asm

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

2013-10-09 14:29:42 +02:00

..

asm.h

dsputil: Make dsputil selectable

2013-04-10 11:04:05 +03:00

bswap.h

Merge remote-tracking branch 'qatar/master'

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

cpu.c

Merge commit 'b78b10c4b78b696927f2801cf2d9f193b4eff28b'

2013-08-29 14:05:15 +02:00

cpu.h

Merge commit '79aec43ce813a3e270743ca64fa3f31fa43df80b'

2013-08-30 11:57:35 +02:00

cpuid.asm

Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'

2012-10-31 13:43:33 +01:00

emms.asm

Merge remote-tracking branch 'qatar/master'

2013-01-19 13:20:25 +01:00

emms.h

lavu: Fix checkheaders for x86/emms.h

2013-02-17 00:18:16 +01:00

float_dsp_init.c

Merge remote-tracking branch 'qatar/master'

2013-07-18 09:53:47 +02:00

float_dsp.asm

Merge commit '566b7a20fd0cab44d344329538d314454a0bcc2f'

2013-05-03 11:57:59 +02:00

intreadwrite.h

…

lls_init.c

avutil/x86: reenable ff_update_lls_avx()

2013-07-02 12:02:08 +02:00

lls.asm

avutil/x86: reenable ff_update_lls_avx()

2013-07-02 12:02:08 +02:00

Makefile

x86: lpc: simd av_update_lls

2013-06-29 13:23:57 +02:00

timer.h

Merge remote-tracking branch 'qatar/master'

2013-09-22 11:51:38 +02:00

w64xmmtest.h

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

x86inc.asm

Merge remote-tracking branch 'qatar/master'

2013-10-09 14:29:42 +02:00

x86util.asm

Merge commit 'd633d12b2cc999cee3ac25bf9a810fe7ff03726d'

2013-01-19 13:11:41 +01:00