diff options
| author | Michael Niedermayer | 2011-10-24 01:01:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer | 2011-10-24 01:01:21 +0200 |
| commit | 2b0cdb7364fbe1e8a7e97d36ba36dc67fb24095e (patch) | |
| tree | 696306b4a66d7598f2795f9fbae4557135ff9104 /libswscale | |
| parent | 42d44ec306d0656ace5cea63867f70fa686141cb (diff) | |
| parent | 16ad77b357ebbe74a7bc9568904c328a2722651e (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Move id3v2 tag writing to a separate file.
swscale: add missing colons to x86 assembly yuv2planeX.
g722: split decoder and encoder into separate files
cosmetics: remove extra spaces before end-of-statement semi-colons
vorbisdec: check output buffer size before writing output
wavpack: calculate bpp using av_get_bytes_per_sample()
ac3enc: Set max value for mode options correctly
lavc: move get_b_cbp() from h263.h to mpeg4videoenc.c
mpeg12: move closed_gop from MpegEncContext to Mpeg1Context
mpeg12: move full_pel from MpegEncContext to Mpeg1Context
mpeg12: move Mpeg1Context from mpeg12.c to mpeg12.h
mpegvideo: remove some unused variables from MpegEncContext.
Conflicts:
libavcodec/mpeg12.c
libavformat/mp3enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/x86/scale.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libswscale/x86/scale.asm b/libswscale/x86/scale.asm index 0d694453c9..2e754862f0 100644 --- a/libswscale/x86/scale.asm +++ b/libswscale/x86/scale.asm @@ -520,7 +520,7 @@ cglobal yuv2planeX_%2_%1, %4, 7, %3 xor r5, r5 -.pixelloop +.pixelloop: %assign %%i 0 ; the rep here is for the 8bit output mmx case, where dither covers ; 8 pixels but we can only handle 2 pixels per register, and thus 4 @@ -543,7 +543,7 @@ cglobal yuv2planeX_%2_%1, %4, 7, %3 mova m2, m1 %endif ; %2 == 8/9/10/16 movsx cntr_reg, r1m -.filterloop_ %+ %%i +.filterloop_ %+ %%i: ; input pixels mov r6, [r2+gprsize*cntr_reg-2*gprsize] %if %2 == 16 |