diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-19 13:01:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-19 13:01:06 +0100 |
| commit | 1b03e09198e5db75064b202e00bd77f84fa47063 (patch) | |
| tree | 8762aef7ade71799436a3f02d91087a807c7ebbb /libswscale | |
| parent | a5faae46a393d52bebf95ac76580968453f10b6c (diff) | |
| parent | ef5d41a5534b65f03d02f2e11a503ab8416bfc3b (diff) | |
Merge commit 'ef5d41a5534b65f03d02f2e11a503ab8416bfc3b'
* commit 'ef5d41a5534b65f03d02f2e11a503ab8416bfc3b':
x86inc: Rename "program_name" to "private_prefix"
configure: Run SHFLAGS through ldflags_filter()
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/x86/input.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libswscale/x86/input.asm b/libswscale/x86/input.asm index 327b9f0bc5..9d5a871255 100644 --- a/libswscale/x86/input.asm +++ b/libswscale/x86/input.asm @@ -98,7 +98,7 @@ cglobal %2 %+ 24ToY, 6, 6, %1, dst, src, u1, u2, w, u3 %define coeff2 [%2_Ycoeff_3x56] %endif ; x86-32/64 && mmsize == 8/16 %if (ARCH_X86_64 || mmsize == 8) && %0 == 3 - jmp mangle(program_name %+ _ %+ %3 %+ 24ToY %+ SUFFIX).body + jmp mangle(private_prefix %+ _ %+ %3 %+ 24ToY %+ SUFFIX).body %else ; (ARCH_X86_64 && %0 == 3) || mmsize == 8 .body: %if cpuflag(ssse3) @@ -188,7 +188,7 @@ cglobal %2 %+ 24ToUV, 7, 7, %1, dstU, dstV, u1, src, u2, w, u3 %define coeffV2 [%2_Vcoeff_3x56] %endif ; x86-32/64 %if ARCH_X86_64 && %0 == 3 - jmp mangle(program_name %+ _ %+ %3 %+ 24ToUV %+ SUFFIX).body + jmp mangle(private_prefix %+ _ %+ %3 %+ 24ToUV %+ SUFFIX).body %else ; ARCH_X86_64 && %0 == 3 .body: %if cpuflag(ssse3) @@ -315,7 +315,7 @@ cglobal %2%3%4%5 %+ ToY, 6, 6, %1, dst, src, u1, u2, w, u3 mova m5, [rgba_Ycoeff_%2%4] mova m6, [rgba_Ycoeff_%3%5] %if %0 == 6 - jmp mangle(program_name %+ _ %+ %6 %+ ToY %+ SUFFIX).body + jmp mangle(private_prefix %+ _ %+ %6 %+ ToY %+ SUFFIX).body %else ; %0 == 6 .body: %if ARCH_X86_64 @@ -371,7 +371,7 @@ cglobal %2%3%4%5 %+ ToUV, 7, 7, %1, dstU, dstV, u1, src, u2, w, u3 %define coeffV2 [rgba_Vcoeff_%3%5] %endif ; x86-64/32 %if ARCH_X86_64 && %0 == 6 - jmp mangle(program_name %+ _ %+ %6 %+ ToUV %+ SUFFIX).body + jmp mangle(private_prefix %+ _ %+ %6 %+ ToUV %+ SUFFIX).body %else ; ARCH_X86_64 && %0 == 6 .body: %if ARCH_X86_64 |