Index: libmpcodecs/dec_video.c
===================================================================
--- libmpcodecs/dec_video.c	(revision 34378)
+++ libmpcodecs/dec_video.c	(working copy)
@@ -423,12 +423,16 @@
 #if HAVE_MMX
     // some codecs are broken, and doesn't restore MMX state :(
     // it happens usually with broken/damaged files.
+#if HAVE_AMD3DNOW
     if (gCpuCaps.has3DNow) {
         __asm__ volatile ("femms\n\t":::"memory");
-    } else if (gCpuCaps.hasMMX) {
+    } else 
+#else
+    if (gCpuCaps.hasMMX) {
         __asm__ volatile ("emms\n\t":::"memory");
     }
 #endif
+#endif
 
     t2 = GetTimer();
     t = t2 - t;
Index: mp3lib/dct64_sse.c
===================================================================
--- mp3lib/dct64_sse.c	(revision 34378)
+++ mp3lib/dct64_sse.c	(working copy)
@@ -287,20 +287,20 @@
         "flds       %0\n\t"
         "flds     (%2)\n\t"
         "fadds   4(%2)\n\t"
-        "fistps 512(%3)\n\t"
+        "fistp 512(%3)\n\t"
 
         "flds     (%2)\n\t"
         "fsubs   4(%2)\n\t"
         "fmul  %%st(1)\n\t"
-        "fistps    (%3)\n\t"
+        "fistp    (%3)\n\t"
 
         "flds   12(%2)\n\t"
         "fsubs   8(%2)\n\t"
         "fmul  %%st(1)\n\t"
-        "fists  256(%4)\n\t"
+        "fist  256(%4)\n\t"
         "fadds  12(%2)\n\t"
         "fadds   8(%2)\n\t"
-        "fistps 256(%3)\n\t"
+        "fistp 256(%3)\n\t"
 
         "flds   16(%2)\n\t"
         "fsubs  20(%2)\n\t"
@@ -309,108 +309,108 @@
         "flds   28(%2)\n\t"
         "fsubs  24(%2)\n\t"
         "fmul  %%st(2)\n\t"
-        "fists  384(%4)\n\t"
+        "fist  384(%4)\n\t"
         "fld   %%st(0)\n\t"
         "fadds  24(%2)\n\t"
         "fadds  28(%2)\n\t"
         "fld   %%st(0)\n\t"
         "fadds  16(%2)\n\t"
         "fadds  20(%2)\n\t"
-        "fistps 384(%3)\n\t"
+        "fistp 384(%3)\n\t"
         "fadd  %%st(2)\n\t"
-        "fistps 128(%3)\n\t"
+        "fistp 128(%3)\n\t"
         "faddp %%st(1)\n\t"
-        "fistps 128(%4)\n\t"
+        "fistp 128(%4)\n\t"
 
         "flds   32(%1)\n\t"
         "fadds  48(%1)\n\t"
-        "fistps 448(%3)\n\t"
+        "fistp 448(%3)\n\t"
 
         "flds   48(%1)\n\t"
         "fadds  40(%1)\n\t"
-        "fistps 320(%3)\n\t"
+        "fistp 320(%3)\n\t"
 
         "flds   40(%1)\n\t"
         "fadds  56(%1)\n\t"
-        "fistps 192(%3)\n\t"
+        "fistp 192(%3)\n\t"
 
         "flds   56(%1)\n\t"
         "fadds  36(%1)\n\t"
-        "fistps  64(%3)\n\t"
+        "fistp  64(%3)\n\t"
 
         "flds   36(%1)\n\t"
         "fadds  52(%1)\n\t"
-        "fistps  64(%4)\n\t"
+        "fistp  64(%4)\n\t"
 
         "flds   52(%1)\n\t"
         "fadds  44(%1)\n\t"
-        "fistps 192(%4)\n\t"
+        "fistp 192(%4)\n\t"
 
         "flds   60(%1)\n\t"
-        "fists  448(%4)\n\t"
+        "fist  448(%4)\n\t"
         "fadds  44(%1)\n\t"
-        "fistps 320(%4)\n\t"
+        "fistp 320(%4)\n\t"
 
         "flds   96(%1)\n\t"
         "fadds 112(%1)\n\t"
         "fld   %%st(0)\n\t"
         "fadds  64(%1)\n\t"
-        "fistps 480(%3)\n\t"
+        "fistp 480(%3)\n\t"
         "fadds  80(%1)\n\t"
-        "fistps 416(%3)\n\t"
+        "fistp 416(%3)\n\t"
 
         "flds  112(%1)\n\t"
         "fadds 104(%1)\n\t"
         "fld   %%st(0)\n\t"
         "fadds  80(%1)\n\t"
-        "fistps 352(%3)\n\t"
+        "fistp 352(%3)\n\t"
         "fadds  72(%1)\n\t"
-        "fistps 288(%3)\n\t"
+        "fistp 288(%3)\n\t"
 
         "flds  104(%1)\n\t"
         "fadds 120(%1)\n\t"
         "fld   %%st(0)\n\t"
         "fadds  72(%1)\n\t"
-        "fistps 224(%3)\n\t"
+        "fistp 224(%3)\n\t"
         "fadds  88(%1)\n\t"
-        "fistps 160(%3)\n\t"
+        "fistp 160(%3)\n\t"
 
         "flds  120(%1)\n\t"
         "fadds 100(%1)\n\t"
         "fld   %%st(0)\n\t"
         "fadds  88(%1)\n\t"
-        "fistps  96(%3)\n\t"
+        "fistp  96(%3)\n\t"
         "fadds  68(%1)\n\t"
-        "fistps  32(%3)\n\t"
+        "fistp  32(%3)\n\t"
 
         "flds  100(%1)\n\t"
         "fadds 116(%1)\n\t"
         "fld   %%st(0)\n\t"
         "fadds  68(%1)\n\t"
-        "fistps  32(%4)\n\t"
+        "fistp  32(%4)\n\t"
         "fadds  84(%1)\n\t"
-        "fistps  96(%4)\n\t"
+        "fistp  96(%4)\n\t"
 
         "flds  116(%1)\n\t"
         "fadds 108(%1)\n\t"
         "fld   %%st(0)\n\t"
         "fadds  84(%1)\n\t"
-        "fistps 160(%4)\n\t"
+        "fistp 160(%4)\n\t"
         "fadds  76(%1)\n\t"
-        "fistps 224(%4)\n\t"
+        "fistp 224(%4)\n\t"
 
         "flds  108(%1)\n\t"
         "fadds 124(%1)\n\t"
         "fld   %%st(0)\n\t"
         "fadds  76(%1)\n\t"
-        "fistps 288(%4)\n\t"
+        "fistp 288(%4)\n\t"
         "fadds  92(%1)\n\t"
-        "fistps 352(%4)\n\t"
+        "fistp 352(%4)\n\t"
 
         "flds  124(%1)\n\t"
-        "fists  480(%4)\n\t"
+        "fist  480(%4)\n\t"
         "fadds  92(%1)\n\t"
-        "fistps 416(%4)\n\t"
+        "fistp 416(%4)\n\t"
         ".byte 0xdf, 0xc0\n\t" // ffreep %%st(0)
         :
         :"m"(costab_mmx[30]), "r"(b1), "r"(b2), "r"(out0), "r"(out1)
Index: libvo/vo_xv.c
===================================================================
--- libvo/vo_xv.c	(revision 34378)
+++ libvo/vo_xv.c	(working copy)
@@ -434,6 +434,13 @@
 
     dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[0] +
         xvimage[current_buf]->pitches[0] * y + x;
+
+    /* If image size has changed, use size last told to us */
+    if ((image_width != w) || (image_height != h)) {
+	w = image_width;
+	h = image_height;
+    }
+
     memcpy_pic(dst, image[0], w, h, xvimage[current_buf]->pitches[0],
                stride[0]);
 
Index: help/help_mp-en.h
===================================================================
--- help/help_mp-en.h	(revision 34378)
+++ help/help_mp-en.h	(working copy)
@@ -1229,6 +1229,7 @@
 
 // ao_sun.c
 #define MSGTR_AO_SUN_RtscSetinfoFailed "[AO SUN] rtsc: SETINFO failed.\n"
+#define MSGTR_AO_SUN_RtscWriteFailed "[AO SUN] rtsc: write failed.\n"
 #define MSGTR_AO_SUN_CantOpenAudioDev "[AO SUN] Can't open audio device %s, %s  -> nosound.\n"
 #define MSGTR_AO_SUN_UnsupSampleRate "[AO SUN] audio_setup: your card doesn't support %d channel, %s, %d Hz samplerate.\n"
 #define MSGTR_AO_SUN_CantUseSelect "[AO SUN]\n   ***  Your audio driver DOES NOT support select()  ***\nRecompile MPlayer with #undef HAVE_AUDIO_SELECT in config.h !\n\n"
