virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

swscale: fix crashes in yuv2yuvX on x86-32.

Browse Source 
They were introduced in an earlier commit that introduced use of named
arguments. One cause was a typo, a second cause appears to be a bug in
x264asm that I work around by not using named arguments.
This commit is contained in:
Ronald S. Bultje
2012-02-13 13:28:50 -08:00
parent 186dcbcb50
commit 771bab7f57
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libswscale/x86/output.asm
View File

@@ -59,7 +59,7 @@ SECTION .text
%macro yuv2planeX_fn 3 %macro yuv2planeX_fn 3
%if ARCH_X86_32 %if ARCH_X86_32
%define cntr_reg filterq %define cntr_reg fltsizeq
%define movsx mov %define movsx mov
%else %else
%define cntr_reg r11 %define cntr_reg r11
@@ -146,7 +146,7 @@ cglobal yuv2planeX_%1, %3, 7, %2, filter, fltsize, src, dst, w, dither, offset
mova m1, [yuv2yuvX_%1_start] mova m1, [yuv2yuvX_%1_start]
mova m2, m1 mova m2, m1
%endif ; %1 == 8/9/10/16 %endif ; %1 == 8/9/10/16
movsx cntr_reg, fltsizem movsx cntr_reg, r1m ; FIXME should be fltsizem, but the assembler does the wrong thing b/c of SUB above
.filterloop_ %+ %%i: .filterloop_ %+ %%i:
; input pixels ; input pixels
mov r6, [srcq+gprsize*cntr_reg-2*gprsize] mov r6, [srcq+gprsize*cntr_reg-2*gprsize]