Index: aac.c
===================================================================
--- aac.c	(revision 23336)
+++ aac.c	(working copy)
@@ -1929,7 +1929,7 @@
         ac->m4ac.sample_rate     = hdr_info.sample_rate;
         ac->m4ac.sampling_index  = hdr_info.sampling_index;
         ac->m4ac.object_type     = hdr_info.object_type;
-        if (!ac->avccontext->sample_rate)
+//        if (!ac->avccontext->sample_rate)
             ac->avccontext->sample_rate = hdr_info.sample_rate;
         if (hdr_info.num_aac_frames == 1) {
             if (!hdr_info.crc_absent)
Index: x86/dsputil_mmx.c
===================================================================
--- x86/dsputil_mmx.c	(revision 23336)
+++ x86/dsputil_mmx.c	(working copy)
@@ -723,32 +723,28 @@
     }
 }
 
-static inline void transpose4x4(uint8_t *dst, uint8_t *src, int dst_stride, int src_stride){
+static inline void transpose4x4(uint8_t *dst, uint8_t *src, x86_reg dst_stride, x86_reg src_stride){
     __asm__ volatile( //FIXME could save 1 instruction if done as 8x4 ...
-        "movd  %4, %%mm0                \n\t"
-        "movd  %5, %%mm1                \n\t"
-        "movd  %6, %%mm2                \n\t"
-        "movd  %7, %%mm3                \n\t"
+        "movd  (%0), %%mm0              \n\t"
+        "movd  (%2), %%mm1              \n\t"
+        "movd  (%0, %1, 2), %%mm2       \n\t"
+        "movd  (%2, %1, 2), %%mm3       \n\t"
         "punpcklbw %%mm1, %%mm0         \n\t"
         "punpcklbw %%mm3, %%mm2         \n\t"
         "movq %%mm0, %%mm1              \n\t"
         "punpcklwd %%mm2, %%mm0         \n\t"
         "punpckhwd %%mm2, %%mm1         \n\t"
-        "movd  %%mm0, %0                \n\t"
+        "movd  %%mm0, (%3)              \n\t"
         "punpckhdq %%mm0, %%mm0         \n\t"
-        "movd  %%mm0, %1                \n\t"
-        "movd  %%mm1, %2                \n\t"
+        "movd  %%mm0, (%5)              \n\t"
+        "movd  %%mm1, (%3, %4, 2)       \n\t"
         "punpckhdq %%mm1, %%mm1         \n\t"
-        "movd  %%mm1, %3                \n\t"
+        "movd  %%mm1, (%5, %4, 2)       \n\t"
 
-        : "=m" (*(uint32_t*)(dst + 0*dst_stride)),
-          "=m" (*(uint32_t*)(dst + 1*dst_stride)),
-          "=m" (*(uint32_t*)(dst + 2*dst_stride)),
-          "=m" (*(uint32_t*)(dst + 3*dst_stride))
-        :  "m" (*(uint32_t*)(src + 0*src_stride)),
-           "m" (*(uint32_t*)(src + 1*src_stride)),
-           "m" (*(uint32_t*)(src + 2*src_stride)),
-           "m" (*(uint32_t*)(src + 3*src_stride))
+        :
+        : "r"(src), "r"(src_stride), "r"(src + src_stride),
+          "r"(dst), "r"(dst_stride), "r"(dst + dst_stride)
+        : "memory"
     );
 }