highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  fate: atrac: Place atrac1 and atrac3 tests in different groups
  fate: aac: cosmetics: Group AAC LATM tests together
  x86: avresample: Add missing colons to assembly labels

Conflicts:
	tests/fate/aac.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-11-06 15:11:53 +01:00
parent 0fe8c9f458 e6c4c0f7cf
commit 1e4e497911
3 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavresample/x86/audio_convert.asm
View File

@@ -247,7 +247,7 @@ cglobal conv_s16p_to_s16_2ch, 3,4,5, dst, src0, len, src1
add src1q, lenq
lea dstq, [dstq+2*lenq]
neg lenq
.loop
.loop:
mova m0, [src0q+lenq ]
mova m1, [src1q+lenq ]
mova m2, [src0q+lenq+mmsize]
@@ -716,7 +716,7 @@ cglobal conv_fltp_to_flt_2ch, 3,4,5, dst, src0, len, src1
add src1q, lenq
lea dstq, [dstq+2*lenq]
neg lenq
.loop
.loop:
mova m0, [src0q+lenq ]
mova m1, [src1q+lenq ]
mova m2, [src0q+lenq+mmsize]