Skip to content

V
vlc-gpu
Commit 32e2a1b4 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

Fix the ffmpeg-mmx-patch. Thanks to David E. Still

parent b6a82807
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 40 deletions
extras/contrib/src/Patches/ffmpeg-macosx-intel-mmx.patch
View file @ 32e2a1b4
...@@ -136,53 +136,29 @@ Index: libavcodec/i386/flacdsp_mmx.c ...@@ -136,53 +136,29 @@ Index: libavcodec/i386/flacdsp_mmx.c
"movsd %0, %%xmm7 \n\t" "movsd %0, %%xmm7 \n\t"
"movapd %1, %%xmm6 \n\t" "movapd %1, %%xmm6 \n\t"
@@ -54,7 +53,7 @@ @@ -54,7 +53,7 @@
"sub $8, %1 \n\t"\ "sub $8, %1 \n\t"\
"add $8, %0 \n\t"\ "add $8, %0 \n\t"\
"jl 1b \n\t"\ "jl 1b \n\t"\
- :"+&r"(i), "+&r"(j)\ - :"+&r"(i), "+&r"(j)\
+ :"+&r"(i)\ + :"+&r"(i)\
:"r"(w_data+n2), "r"(data+n2)\ :"r"(w_data+n2), "r"(data+n2)\
); );
if(len&1) if(len&1)
@@ -84,9 +83,11 @@ @@ -84,6 +83,8 @@
x86_reg i = -len*sizeof(double); "movsd "MANGLE(ff_pd_1)", %%xmm0 \n\t"
if(j == lag-2) { "movsd "MANGLE(ff_pd_1)", %%xmm1 \n\t"
asm volatile( "movsd "MANGLE(ff_pd_1)", %%xmm2 \n\t"
- "movsd %6, %%xmm0 \n\t"
- "movsd %6, %%xmm1 \n\t"
- "movsd %6, %%xmm2 \n\t"
+ "movsd %0, %%xmm0 \n\t"
+ "movsd %0, %%xmm1 \n\t"
+ "movsd %0, %%xmm2 \n\t"
+ :: "m"(*ff_pd_1) ); + :: "m"(*ff_pd_1) );
+ asm volatile( + asm volatile(
"1: \n\t" "1: \n\t"
"movapd (%4,%0), %%xmm3 \n\t" "movapd (%4,%0), %%xmm3 \n\t"
"movupd -8(%5,%0), %%xmm4 \n\t" "movupd -8(%5,%0), %%xmm4 \n\t"
@@ -109,12 +110,14 @@ @@ -115,6 +116,8 @@
"movsd %%xmm1, %2 \n\t"
"movsd %%xmm2, %3 \n\t"
:"+&r"(i), "=m"(autoc[j]), "=m"(autoc[j+1]), "=m"(autoc[j+2])
- :"r"(data1+len), "r"(data1+len-j), "m"(*ff_pd_1)
+ :"r"(data1+len), "r"(data1+len-j)
);
} else {
asm volatile( asm volatile(
- "movsd %5, %%xmm0 \n\t" "movsd "MANGLE(ff_pd_1)", %%xmm0 \n\t"
- "movsd %5, %%xmm1 \n\t" "movsd "MANGLE(ff_pd_1)", %%xmm1 \n\t"
+ "movsd %0, %%xmm0 \n\t"
+ "movsd %0, %%xmm1 \n\t"
+ :: "m"(*ff_pd_1) ); + :: "m"(*ff_pd_1) );
+ asm volatile( + asm volatile(
"1: \n\t" "1: \n\t"
"movapd (%3,%0), %%xmm3 \n\t" "movapd (%3,%0), %%xmm3 \n\t"
"movupd -8(%4,%0), %%xmm4 \n\t" "movupd -8(%4,%0), %%xmm4 \n\t"
@@ -131,7 +134,7 @@
"movsd %%xmm0, %1 \n\t"
"movsd %%xmm1, %2 \n\t"
:"+&r"(i), "=m"(autoc[j]), "=m"(autoc[j+1])
- :"r"(data1+len), "r"(data1+len-j), "m"(*ff_pd_1)
+ :"r"(data1+len), "r"(data1+len-j)
);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment