1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
FFmpeg/libavutil/x86
Michael Niedermayer 7897919a88 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  aacdec: Fix an off-by-one overwrite when switching to LTP profile from MAIN.
  x86inc: fix stack alignment on win64
  rtpproto: Remove unused defines

Conflicts:
	libavcodec/aacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-13 12:23:48 +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 remote-tracking branch 'qatar/master' 2012-12-13 12:23:48 +01:00
x86util.asm Merge commit '9d5c62ba5b586c80af508b5914934b1c439f6652' 2012-12-06 14:33:38 +01:00