          "psubw %%mm5, %%mm3               \n\t" /* -6b + 3c - d */\
          "paddw %6, %%mm4                  \n\t"\
          "paddw %%mm3, %%mm4               \n\t" /* 20a - 6b + 3c - d */\
-@@ -2062,7 +2062,9 @@
+@@ -995,7 +995,9 @@
          "decl %2                          \n\t"\
          " jnz 1b                          \n\t"\
-         : "+a"(src), "+c"(dst), "+g"(h)\
+         : "+a"(src), "+c"(dst), "+D"(h)\
 -        : "d"((long)srcStride), "S"((long)dstStride), /*"m"(ff_pw_20), "m"(ff_pw_3),*/ "m"(temp), "m"(ROUNDER)\
-+       : "d"((long)srcStride), "S"((long)dstStride),\ 
-+         "m"(temp), "m"(ROUNDER),\
-+         "m"(ff_pw_20), "m"(ff_pw_3)\
++        : "d"((long)srcStride), "S"((long)dstStride),\ 
++          "m"(temp), "m"(ROUNDER),\
++          "m"(ff_pw_20), "m"(ff_pw_3)\
          : "memory"\
      );\
  }\
-@@ -2140,10 +2142,10 @@
+@@ -1071,10 +1073,10 @@
          "paddw %%mm5, %%mm5               \n\t" /* 2b */\
          "psubw %%mm5, %%mm6               \n\t" /* c - 2b */\
          "pshufw $0x06, %%mm0, %%mm5       \n\t" /* 0C0B0A0A */\

         "paddw " #rnd ", %%mm4            \n\t" /* x2 */\
         "paddw %%mm4, %%mm5               \n\t" /* 20x1 - 6x2 + 3x3 - x4 */\
         "psraw $5, %%mm5                  \n\t"\
@@ -1973,10 +1973,10 @@
         "paddw %%mm5, %%mm5               \n\t" /* 2b */\
         "psubw %%mm5, %%mm6               \n\t" /* c - 2b */\
         "pshufw $0x06, %%mm0, %%mm5       \n\t" /* 0C0B0A0A */\

         :"memory"\
     );\
 }\
@@ -1257,19 +1263,19 @@
         "movq 8(%0), %%mm1              \n\t"\
         "movq 16(%0), %%mm2             \n\t"\
         "movq 24(%0), %%mm3             \n\t"\
