diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-13 00:39:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-13 00:39:19 +0200 |
| commit | ca19862d3879dfadfd6c1a1a443eac40fc433385 (patch) | |
| tree | dc114d719849d6c3645063e02378dfddecbc991a /libavcodec/x86/fmtconvert.asm | |
| parent | 5eeecde859ebfa384fbe3c8a1aa62a6b8f6c58e4 (diff) | |
| parent | 18e8fef7c9292041e3266487d9bc6b59e5eaa798 (diff) | |
| download | ffmpeg-ca19862d3879dfadfd6c1a1a443eac40fc433385.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libxvid: remove disabled code
qdm2: make a table static const
qdm2: simplify bitstream reader setup for some subpacket types
qdm2: use get_bits_left()
build: Consistently handle conditional compilation for all optimization OBJS.
avpacket, bfi, bgmc, rawenc: K&R prettyprinting cosmetics
msrle: convert MS RLE decoding function to bytestream2.
x86inc improvements for 64-bit
Conflicts:
common.mak
libavcodec/avpacket.c
libavcodec/bfi.c
libavcodec/msrledec.c
libavcodec/qdm2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/fmtconvert.asm')
| -rw-r--r-- | libavcodec/x86/fmtconvert.asm | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/x86/fmtconvert.asm b/libavcodec/x86/fmtconvert.asm index ca39aa30f8..72bee55669 100644 --- a/libavcodec/x86/fmtconvert.asm +++ b/libavcodec/x86/fmtconvert.asm @@ -179,9 +179,8 @@ FLOAT_TO_INT16_INTERLEAVE2 sse2 %macro FLOAT_TO_INT16_INTERLEAVE6 1 ; void float_to_int16_interleave6_sse(int16_t *dst, const float **src, int len) -cglobal float_to_int16_interleave6_%1, 2,7,0, dst, src, src1, src2, src3, src4, src5 +cglobal float_to_int16_interleave6_%1, 2,8,0, dst, src, src1, src2, src3, src4, src5, len %if ARCH_X86_64 - %define lend r10d mov lend, r2d %else %define lend dword r2m @@ -240,9 +239,8 @@ FLOAT_TO_INT16_INTERLEAVE6 3dn2 ;----------------------------------------------------------------------------- %macro FLOAT_INTERLEAVE6 2 -cglobal float_interleave6_%1, 2,7,%2, dst, src, src1, src2, src3, src4, src5 +cglobal float_interleave6_%1, 2,8,%2, dst, src, src1, src2, src3, src4, src5, len %if ARCH_X86_64 - %define lend r10d mov lend, r2d %else %define lend dword r2m |