diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-06 15:11:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-06 15:11:53 +0100 |
| commit | 1e4e4979117e91360185edd5f58026e5e090fe41 (patch) | |
| tree | c768872bd48451a984d20a067d105b370335af98 /libavresample | |
| parent | 0fe8c9f4585866457b5eb79aa34c32468ad39425 (diff) | |
| parent | e6c4c0f7cfaf0378a70f6f7f0611d4c21433067a (diff) | |
| download | ffmpeg-1e4e4979117e91360185edd5f58026e5e090fe41.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* 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>
Diffstat (limited to 'libavresample')
| -rw-r--r-- | libavresample/x86/audio_convert.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavresample/x86/audio_convert.asm b/libavresample/x86/audio_convert.asm index e7f715776c..567a916bc8 100644 --- a/libavresample/x86/audio_convert.asm +++ b/libavresample/x86/audio_convert.asm @@ -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] |