[SCM] libav/experimental: gcc 2.95 fix

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:56:41 UTC 2013


The following commit has been merged in the experimental branch:
commit 470d2d03cc5a0ee5cca225ec81027a6b86d92642
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Thu Feb 22 00:04:36 2007 +0000

    gcc 2.95 fix
    
    Originally committed as revision 8059 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/i386/dsputil_h264_template_mmx.c b/libavcodec/i386/dsputil_h264_template_mmx.c
index daaa8d9..8fa9eac 100644
--- a/libavcodec/i386/dsputil_h264_template_mmx.c
+++ b/libavcodec/i386/dsputil_h264_template_mmx.c
@@ -188,8 +188,8 @@ static void H264_CHROMA_MC4_TMPL(uint8_t *dst/*align 4*/, uint8_t *src/*align 1*
         "pxor   %%mm7, %%mm7        \n\t"
         "movd %5, %%mm2             \n\t"
         "movd %6, %%mm3             \n\t"
-        "movq %7, %%mm4             \n\t"
-        "movq %7, %%mm5             \n\t"
+        "movq "MANGLE(ff_pw_8)", %%mm4\n\t"
+        "movq "MANGLE(ff_pw_8)", %%mm5\n\t"
         "punpcklwd %%mm2, %%mm2     \n\t"
         "punpcklwd %%mm3, %%mm3     \n\t"
         "punpcklwd %%mm2, %%mm2     \n\t"
@@ -246,7 +246,7 @@ static void H264_CHROMA_MC4_TMPL(uint8_t *dst/*align 4*/, uint8_t *src/*align 1*
         "sub $2, %2                 \n\t"
         "jnz 1b                     \n\t"
         : "+r"(dst), "+r"(src), "+r"(h)
-        : "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)
     );
 }
 

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list