# HG changeset patch
# User mru
# Date 1170369882 0
# Node ID 99e960878498846aa624b8e4051235f671980782
# Parent  33f181383a21b49c05183feebf718771489d1966
remove redundant loads

diff -r 33f181383a21 -r 99e960878498 armv4l/simple_idct_armv6.S
--- a/armv4l/simple_idct_armv6.S	Thu Feb 01 18:39:49 2007 +0000
+++ b/armv4l/simple_idct_armv6.S	Thu Feb 01 22:44:42 2007 +0000
@@ -51,14 +51,14 @@
   Compute partial IDCT of single row.
   shift = left-shift amount
   a1 = source address
+  a3 = row[2,0]
+  a4 = row[3,1]
 
   Output in registers v1--v8
 */
         .macro idct_row shift
-        ldr    a3, [a1]              /* a3 = row[2,0] */
         ldr    ip, [pc, #(w42-.-8)]  /* ip = W4 | (W2 << 16) */
         ldr    lr, [pc, #(w46-.-8)]  /* lr = W4 | (W6 << 16) */
-        ldr    a4, [a1, #8]          /* a4 = row[3,1] */
         mov    a2, #(1<<(\shift-1))
         smlad  v1, a3, ip, a2
         smlsd  v4, a3, ip, a2
@@ -248,6 +248,8 @@
 idct_col_armv6:
         stmfd  sp!, {a2, lr}
 
+        ldr    a3, [a1]              /* a3 = row[2,0] */
+        ldr    a4, [a1, #8]          /* a4 = row[3,1] */
         idct_row COL_SHIFT
         ldr    a2, [sp], #4
         idct_finish_shift COL_SHIFT
@@ -275,6 +277,8 @@
 idct_col_put_armv6:
         stmfd  sp!, {a2, a3, lr}
 
+        ldr    a3, [a1]              /* a3 = row[2,0] */
+        ldr    a4, [a1, #8]          /* a4 = row[3,1] */
         idct_row COL_SHIFT
         ldmfd  sp!, {a2, a3}
         idct_finish_shift_sat COL_SHIFT
@@ -304,6 +308,8 @@
 idct_col_add_armv6:
         stmfd  sp!, {a2, a3, lr}
 
+        ldr    a3, [a1]              /* a3 = row[2,0] */
+        ldr    a4, [a1, #8]          /* a4 = row[3,1] */
         idct_row COL_SHIFT
         ldmfd  sp!, {a2, a3}
         idct_finish
diff -r 33f181383a21 -r 99e960878498 avcodec.h
--- a/avcodec.h	Thu Feb 01 18:39:49 2007 +0000
+++ b/avcodec.h	Thu Feb 01 22:44:42 2007 +0000
@@ -238,6 +238,7 @@
     CODEC_ID_DSICINAUDIO,
     CODEC_ID_IMC,
     CODEC_ID_MUSEPACK7,
+    CODEC_ID_MLP,
 
     /* subtitle codecs */
     CODEC_ID_DVD_SUBTITLE= 0x17000,