Skip to content

V
vlc-1.1
Commit ecafa84f authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

contribs: fixed ffmpeg patch

parent 1db1e0f0
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
extras/contrib/src/Patches/ffmpeg-macosx-intel-mmx.patch
View file @ ecafa84f
...@@ -40,9 +40,9 @@ Index: libavcodec/i386/motion_est_mmx.c ...@@ -40,9 +40,9 @@ Index: libavcodec/i386/motion_est_mmx.c
Index: libavcodec/i386/dsputil_h264_template_mmx.c Index: libavcodec/i386/dsputil_h264_template_mmx.c
=================================================================== ===================================================================
--- libavcodec/i386/dsputil_h264_template_mmx.c (revision 11270) --- libavcodec/i386/dsputil_h264_template_mmx.c (revision 11834)
+++ libavcodec/i386/dsputil_h264_template_mmx.c (working copy) +++ libavcodec/i386/dsputil_h264_template_mmx.c (working copy)
@@ -188,8 +188,8 @@ @@ -192,8 +192,8 @@
"pxor %%mm7, %%mm7 \n\t" "pxor %%mm7, %%mm7 \n\t"
"movd %5, %%mm2 \n\t" "movd %5, %%mm2 \n\t"
"movd %6, %%mm3 \n\t" "movd %6, %%mm3 \n\t"
...@@ -53,11 +53,11 @@ Index: libavcodec/i386/dsputil_h264_template_mmx.c ...@@ -53,11 +53,11 @@ Index: libavcodec/i386/dsputil_h264_template_mmx.c
"punpcklwd %%mm2, %%mm2 \n\t" "punpcklwd %%mm2, %%mm2 \n\t"
"punpcklwd %%mm3, %%mm3 \n\t" "punpcklwd %%mm3, %%mm3 \n\t"
"punpcklwd %%mm2, %%mm2 \n\t" "punpcklwd %%mm2, %%mm2 \n\t"
@@ -246,7 +246,7 @@ @@ -250,7 +250,7 @@
"sub $2, %2 \n\t" "sub $2, %2 \n\t"
"jnz 1b \n\t" "jnz 1b \n\t"
: "+r"(dst), "+r"(src), "+r"(h) : "+r"(dst), "+r"(src), "+r"(h)
- : "r"((long)stride), "m"(ff_pw_32), "m"(x), "m"(y) - : "r"((long)stride), "m"(*ff_pw_32), "m"(x), "m"(y)
+ : "r"((long)stride), "m"(ff_pw_32), "m"(x), "m"(y), "m"(ff_pw_8) + : "r"((long)stride), "m"(ff_pw_32), "m"(x), "m"(y), "m"(ff_pw_8)
); );
} }
......
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