Michael Niedermayer a01fe55077 Merge commit 'c0dc57f1264dad1e121772d03abdb9e14ed8857f' ...

* commit 'c0dc57f1264dad1e121772d03abdb9e14ed8857f':
  asyncts: merge two conditions
  x86inc: fully concatenate tokens to fix macro expansion for nasm
  h264: initialize frame-mt context copies properly

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

2012-12-14 15:43:46 +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 '9d5c62ba5b586c80af508b5914934b1c439f6652'

2012-12-06 14:33:38 +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 commit 'c0dc57f1264dad1e121772d03abdb9e14ed8857f'

2012-12-14 15:43:46 +01:00

x86util.asm

Merge commit '9d5c62ba5b586c80af508b5914934b1c439f6652'

2012-12-06 14:33:38 +01:00