--- mjpegtools-1.6.2/yuvdenoise/motion.c.orig	2005-01-29 15:08:50.515458080 +0100
+++ mjpegtools-1.6.2/yuvdenoise/motion.c	2005-01-29 15:25:49.220591360 +0100
@@ -146,12 +146,12 @@
     " pxor        %%mm7 , %%mm7;           /* clear mm7                                          */\n"
     "                                      /*                                                    */\n"
     " movl         %1    , %%eax;          /* load frameadress into eax                          */\n"
-    " movl         %2    , %%ebx;          /* load frameadress into ebx                          */\n"
+    " movl         %2    , %%esi;          /* load frameadress into esi                          */\n"
     " movl         %3    , %%ecx;          /* load width       into ecx                          */\n"
     "                                      /*                                                    */\n"
     ".rept 8                    ;          /* Loop for 8 lines                                   */\n"
     " movq        (%%eax), %%mm1;          /* 8 Pixels from filtered frame to mm1                */\n"
-    " movq        (%%ebx), %%mm2;          /* 8 Pixels from reference frame to mm2               */\n"
+    " movq        (%%esi), %%mm2;          /* 8 Pixels from reference frame to mm2               */\n"
     " movq         %%mm2 , %%mm3;          /* hold a copy of mm2 in mm3                          */\n"
     " psubusb      %%mm1 , %%mm3;          /* positive differences between mm2 and mm1           */\n"
     " psubusb      %%mm2 , %%mm1;          /* positive differences between mm1 and mm3           */\n"
@@ -162,13 +162,13 @@
     " paddusw      %%mm1 , %%mm0;          /* add mm1 (stored in mm1 and mm2...)                 */\n"
     " paddusw      %%mm2 , %%mm0;          /* to mm0                                             */\n"
     " addl         %%ecx , %%eax;          /* add framewidth to frameaddress                     */\n"
-    " addl         %%ecx , %%ebx;          /* add framewidth to frameaddress                     */\n"
+    " addl         %%ecx , %%esi;          /* add framewidth to frameaddress                     */\n"
     " .endr                                /* end loop                                           */\n"
     "                                      /*                                                    */\n"
     " movq         %%mm0 , %0   ;          /* make mm0 available to gcc ...                      */\n"
     :"=m" (a)     
     :"m" (frm), "m" (ref), "m" (denoiser.frame.w)
-    :"%eax", "%ebx", "%ecx"
+    :"%eax", "%esi", "%ecx"
     );
 #endif
 
@@ -191,21 +191,21 @@
     (
     " pxor         %%mm0 , %%mm0;          /* clear mm0                                          */\n"
     " movl         %1    , %%eax;          /* load frameadress into eax                          */\n"
-    " movl         %2    , %%ebx;          /* load frameadress into ebx                          */\n"
+    " movl         %2    , %%esi;          /* load frameadress into esi                          */\n"
     " movl         %3    , %%ecx;          /* load width       into ecx                          */\n"
     "                           ;          /*                                                    */\n"
     " .rept 8                   ;          /*                                                    */\n"
     " movq        (%%eax), %%mm1;          /* 8 Pixels from filtered frame to mm1                */\n"
-    " psadbw      (%%ebx), %%mm1;          /* 8 Pixels difference to mm1                         */\n"
+    " psadbw      (%%esi), %%mm1;          /* 8 Pixels difference to mm1                         */\n"
     " paddusw      %%mm1 , %%mm0;          /* add result to mm0                                  */\n"
     " addl         %%ecx , %%eax;          /* add framewidth to frameaddress                     */\n"
-    " addl         %%ecx , %%ebx;          /* add framewidth to frameaddress                     */\n"
+    " addl         %%ecx , %%esi;          /* add framewidth to frameaddress                     */\n"
     " .endr                     ;          /*                                                    */\n"
     "                                      /*                                                    */\n"
     " movq         %%mm0 , %0   ;          /* make mm0 available to gcc ...                      */\n"
     :"=m" (a)     
     :"m" (frm), "m" (ref), "m" (denoiser.frame.w)
-    :"%eax", "%ebx", "%ecx"
+    :"%eax", "%esi", "%ecx"
     );
 #endif
   return a;
@@ -254,12 +254,12 @@
     " pxor        %%mm7 , %%mm7;           /* clear mm7                                          */\n"
     "                                      /*                                                    */\n"
     " movl         %1    , %%eax;          /* load frameadress into eax                          */\n"
-    " movl         %2    , %%ebx;          /* load frameadress into ebx                          */\n"
+    " movl         %2    , %%esi;          /* load frameadress into esi                          */\n"
     " movl         %3    , %%ecx;          /* load width       into ecx                          */\n"
     "                                      /*                                                    */\n"
     ".rept 4                    ;          /* Loop for 4 lines                                   */\n"
     " movd        (%%eax), %%mm1;          /* 4 Pixels from filtered frame to mm1                */\n"
-    " movd        (%%ebx), %%mm2;          /* 4 Pixels from reference frame to mm2               */\n"
+    " movd        (%%esi), %%mm2;          /* 4 Pixels from reference frame to mm2               */\n"
     " movq         %%mm2 , %%mm3;          /* hold a copy of mm2 in mm3                          */\n"
     " psubusb      %%mm1 , %%mm3;          /* positive differences between mm2 and mm1           */\n"
     " psubusb      %%mm2 , %%mm1;          /* positive differences between mm1 and mm3           */\n"
@@ -270,13 +270,13 @@
     " paddusw      %%mm1 , %%mm2;          /* add mm1 (stored in mm1 and mm2...)                 */\n"
     " paddusw      %%mm2 , %%mm0;          /* to mm0                                             */\n"
     " addl         %%ecx , %%eax;          /* add framewidth to frameaddress                     */\n"
-    " addl         %%ecx , %%ebx;          /* add framewidth to frameaddress                     */\n"
+    " addl         %%ecx , %%esi;          /* add framewidth to frameaddress                     */\n"
     " .endr                                /* end loop                                           */\n"
     "                                      /*                                                    */\n"
     " movq         %%mm0 , %0   ;          /* make mm0 available to gcc ...                      */\n"
     :"=m" (a)     
     :"m" (frm), "m" (ref), "m" (halfwidth)
-    :"%eax", "%ebx", "%ecx"
+    :"%eax", "%esi", "%ecx"
     );
 #endif
   return (uint32_t)(a[0]+a[1]+a[2]+a[3]);
@@ -300,13 +300,13 @@
     " pxor        %%mm7 , %%mm7;           /* clear mm7                                          */\n"
     "                                      /*                                                    */\n"
     " movl         %1    , %%eax;          /* load frameadress into eax                          */\n"
-    " movl         %2    , %%ebx;          /* load frameadress into ebx                          */\n"
+    " movl         %2    , %%esi;          /* load frameadress into esi                          */\n"
     " movl         %3    , %%ecx;          /* load width       into ecx                          */\n"
     "                                      /*                                                    */\n"
     ".rept 8                    ;          /* Loop for 8 lines                                   */\n"
     " movw        (%%eax),  %%dx;          /*                                                    */\n"
     " movd         %%edx , %%mm1;          /* 2 Pixels from filtered frame to mm1                */\n"
-    " movw        (%%ebx),  %%dx;          /*                                                    */\n"
+    " movw        (%%esi),  %%dx;          /*                                                    */\n"
     " movd         %%edx , %%mm2;          /* 2 Pixels from reference frame to mm2               */\n"
     " movq         %%mm2 , %%mm3;          /* hold a copy of mm2 in mm3                          */\n"
     " psubusb      %%mm1 , %%mm3;          /* positive differences between mm2 and mm1           */\n"
@@ -318,13 +318,13 @@
     " paddusw      %%mm1 , %%mm2;          /* add mm1 (stored in mm1 and mm2...)                 */\n"
     " paddusw      %%mm2 , %%mm0;          /* to mm0                                             */\n"
     " addl         %%ecx , %%eax;          /* add framewidth to frameaddress                     */\n"
-    " addl         %%ecx , %%ebx;          /* add framewidth to frameaddress                     */\n"
+    " addl         %%ecx , %%esi;          /* add framewidth to frameaddress                     */\n"
     " .endr                                /* end loop                                           */\n"
     "                                      /*                                                    */\n"
     " movq         %%mm0 , %0   ;          /* make mm0 available to gcc ...                      */\n"
     :"=m" (a)     
     :"m" (frm), "m" (ref), "m" (W2)
-    :"%eax", "%ebx", "%ecx"
+    :"%eax", "%esi", "%ecx"
     );
 #endif
   return (uint32_t)(a[0]+a[1]+a[2]+a[3]+a[4]+a[5]+a[6]+a[7]);
@@ -348,22 +348,22 @@
     (
     " pxor         %%mm0 , %%mm0;          /* clear mm0                                          */\n"
     " movl         %1    , %%eax;          /* load frameadress into eax                          */\n"
-    " movl         %2    , %%ebx;          /* load frameadress into ebx                          */\n"
+    " movl         %2    , %%esi;          /* load frameadress into esi                          */\n"
     " movl         %3    , %%ecx;          /* load width       into ecx                          */\n"
     "                           ;          /*                                                    */\n"
     " .rept 4                   ;          /*                                                    */\n"
     " movd        (%%eax), %%mm1;          /* 4 Pixels from filtered frame to mm1                */\n"
-    " movd        (%%ebx), %%mm2;          /* 4 Pixels from filtered frame to mm2                */\n"
+    " movd        (%%esi), %%mm2;          /* 4 Pixels from filtered frame to mm2                */\n"
     " psadbw       %%mm2 , %%mm1;          /* 4 Pixels difference to mm1                         */\n"
     " paddusw      %%mm1 , %%mm0;          /* add result to mm0                                  */\n"
     " addl         %%ecx , %%eax;          /* add framewidth to frameaddress                     */\n"
-    " addl         %%ecx , %%ebx;          /* add framewidth to frameaddress                     */\n"
+    " addl         %%ecx , %%esi;          /* add framewidth to frameaddress                     */\n"
     " .endr                     ;          /*                                                    */\n"
     "                                      /*                                                    */\n"
     " movq         %%mm0 , %0   ;          /* make mm0 available to gcc ...                      */\n"
     :"=m" (a)     
     :"m" (frm), "m" (ref), "m" (halfwidth)
-    :"%eax", "%ebx", "%ecx"
+    :"%eax", "%esi", "%ecx"
     );
 #endif
   return a;
@@ -385,24 +385,24 @@
     (
     " pxor         %%mm0 , %%mm0;          /* clear mm0                                          */\n"
     " movl         %1    , %%eax;          /* load frameadress into eax                          */\n"
-    " movl         %2    , %%ebx;          /* load frameadress into ebx                          */\n"
+    " movl         %2    , %%esi;          /* load frameadress into esi                          */\n"
     " movl         %3    , %%ecx;          /* load width       into ecx                          */\n"
     "                           ;          /*                                                    */\n"
     " .rept 8                   ;          /*                                                    */\n"
     " movw        (%%eax),  %%dx;          /*                                                    */\n"
     " movd         %%edx , %%mm1;          /* 2 Pixels from filtered frame to mm1                */\n"
-    " movw        (%%ebx),  %%dx;          /*                                                    */\n"
+    " movw        (%%esi),  %%dx;          /*                                                    */\n"
     " movd         %%edx , %%mm2;          /* 2 Pixels from filtered frame to mm2                */\n"
     " psadbw       %%mm2 , %%mm1;          /* 2 Pixels difference to mm1                         */\n"
     " paddusw      %%mm1 , %%mm0;          /* add result to mm0                                  */\n"
     " addl         %%ecx , %%eax;          /* add framewidth to frameaddress                     */\n"
-    " addl         %%ecx , %%ebx;          /* add framewidth to frameaddress                     */\n"
+    " addl         %%ecx , %%esi;          /* add framewidth to frameaddress                     */\n"
     " .endr                     ;          /*                                                    */\n"
     "                                      /*                                                    */\n"
     " movq         %%mm0 , %0   ;          /* make mm0 available to gcc ...                      */\n"
     :"=m" (a)     
     :"m" (frm), "m" (ref), "m" (W2)
-    :"%eax", "%ebx", "%ecx"
+    :"%eax", "%esi", "%ecx"
     );
 #endif
   return a;
@@ -448,13 +448,13 @@
       (
 	  " pxor         %%mm0 , %%mm0;          /* clear mm0                                          */"
 	  " movl         %1    , %%eax;          /* load frameadress into eax                          */"
-	  " movl         %2    , %%ebx;          /* load frameadress into ebx                          */"
+	  " movl         %2    , %%esi;          /* load frameadress into esi                          */"
 	  " movl         %3    , %%ecx;          /* load frameadress into ecx                          */"
 	  " movl         %4    , %%edx;          /* load width       into edx                          */"
 	  "                           ;          /*                                                    */"
 	  " .rept 8                   ;          /*                                                    */"
 	  " movq        (%%eax), %%mm1;          /* 8 Pixels from filtered frame to mm1                */"
-	  " movq        (%%ebx), %%mm2;          /* 8 Pixels from filtered frame to mm2 (displaced)    */"
+	  " movq        (%%esi), %%mm2;          /* 8 Pixels from filtered frame to mm2 (displaced)    */"
 	  " movq        (%%ecx), %%mm3;          /* reference to mm3                                   */"
 	  " psrlq        $1    , %%mm1;          /* average source pixels                              */"
 	  " psrlq        $1    , %%mm2;          /* shift right by one (divide by two)                 */"
@@ -468,14 +468,14 @@
 	  " paddusb      %%mm3 , %%mm1;          /* mm1 now contains abs(mm1-mm2) */"
 	  " paddusw      %%mm1 , %%mm0;          /* add result to mm0                                  */"
 	  " addl         %%edx , %%eax;          /* add framewidth to frameaddress                     */"
-	  " addl         %%edx , %%ebx;          /* add framewidth to frameaddress                     */"
+	  " addl         %%edx , %%esi;          /* add framewidth to frameaddress                     */"
 	  " addl         %%edx , %%ecx;          /* add framewidth to frameaddress                     */"
 	  " .endr                     ;          /*                                                    */"
 	  "                                      /*                                                    */"
 	  " movq         %%mm0 , %0   ;          /* make mm0 available to gcc ...                      */"
 	  :"=m" (a)     
 	  :"m" (frm1),"m" (frm2), "m" (ref), "m" (denoiser.frame.w), "m" (*bit_mask)
-	  :"%eax", "%ebx", "%ecx", "%edx"
+	  :"%eax", "%esi", "%ecx", "%edx"
 	  );
 #endif
   return a;
@@ -497,26 +497,26 @@
       (
 	  " pxor         %%mm0 , %%mm0;          /* clear mm0                                          */\n"
 	  " movl         %1    , %%eax;          /* load frameadress into eax                          */\n"
-	  " movl         %2    , %%ebx;          /* load frameadress into ebx                          */\n"
+	  " movl         %2    , %%esi;          /* load frameadress into esi                          */\n"
 	  " movl         %3    , %%ecx;          /* load frameadress into ecx                          */\n"
 	  " movl         %4    , %%edx;          /* load width       into edx                          */\n"
 	  "                           ;          /*                                                    */\n"
 	  " .rept 8                   ;          /*                                                    */\n"
 	  " movq        (%%eax), %%mm1;          /* 8 Pixels from filtered frame to mm1                */\n"
-	  " movq        (%%ebx), %%mm2;          /* 8 Pixels from filtered frame to mm2 (displaced)    */\n"
+	  " movq        (%%esi), %%mm2;          /* 8 Pixels from filtered frame to mm2 (displaced)    */\n"
 	  " movq        (%%ecx), %%mm3;          /* 8 Pixels from reference frame to mm3               */\n"
 	  " pavgb        %%mm2 , %%mm1;          /* average source pixels                              */\n"
 	  " psadbw       %%mm3 , %%mm1;          /* 8 Pixels difference to mm1                         */\n"
 	  " paddusw      %%mm1 , %%mm0;          /* add result to mm0                                  */\n"
 	  " addl         %%edx , %%eax;          /* add framewidth to frameaddress                     */\n"
-	  " addl         %%edx , %%ebx;          /* add framewidth to frameaddress                     */\n"
+	  " addl         %%edx , %%esi;          /* add framewidth to frameaddress                     */\n"
 	  " addl         %%edx , %%ecx;          /* add framewidth to frameaddress                     */\n"
 	  " .endr                     ;          /*                                                    */\n"
 	  "                                      /*                                                    */\n"
 	  " movq         %%mm0 , %0   ;          /* make mm0 available to gcc ...                      */\n"
 	  :"=m" (a)     
 	  :"m" (frm1),"m" (frm2), "m" (ref), "m" (denoiser.frame.w)
-	  :"%eax", "%ebx", "%ecx", "%edx"
+	  :"%eax", "%esi", "%ecx", "%edx"
 	  );
 #endif
   return a;