Michael Niedermayer 17596198ca Merge commit '80ac87c13dc8c6c063e26a464c5c542357c0583f' ...

* commit '80ac87c13dc8c6c063e26a464c5c542357c0583f':
  lavc: support ZenoXVID custom tag
  libcdio: support recent cdio-paranoia
  float_dsp: Add #ifdef HAVE_INLINE_ASM around vector_fmul_window
  theora: Skip zero-sized headers

Conflicts:
	configure

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

2013-01-18 13:36:39 +01:00

..

asm.h

…

bswap.h

…

cpu.c

Merge commit 'af7d13ee4a4bf8d708f9b0598abb8f6e22b76de1'

2012-11-28 13:32:17 +01:00

cpu.h

…

cpuid.asm

…

float_dsp_init.c

Merge commit '80ac87c13dc8c6c063e26a464c5c542357c0583f'

2013-01-18 13:36:39 +01:00

float_dsp.asm

Merge remote-tracking branch 'qatar/master'

2012-12-08 16:36:47 +01:00

intreadwrite.h

…

Makefile

…

timer.h

…

w64xmmtest.h

…

x86inc.asm

Merge remote-tracking branch 'qatar/master'

2012-12-20 02:51:35 +01:00

x86util.asm

Merge commit 'dae1d507af94261bafd3b11549884e5d1eca590e'

2013-01-16 11:44:45 +01:00