--- ../../ffmpeg/libavcodec/adpcm.c	2008-03-31 12:15:57.000000000 +0200
+++ libavcodec/adpcm.c	2008-04-08 01:21:08.000000000 +0200
@@ -34,6 +34,7 @@
  * EA IMA EACS decoder by Peter Ross (pross@xvid.org)
  * EA IMA SEAD decoder by Peter Ross (pross@xvid.org)
  * EA ADPCM XAS decoder by Peter Ross (pross@xvid.org)
+ * MAXIS EA ADPCM decoder by Robert Marston (rmarston@gmail.com)
  * THP ADPCM decoder by Marco Gerards (mgerards@xs4all.nl)
  *
  * Features and limitations:
@@ -149,6 +150,10 @@
 typedef struct ADPCMContext {
     int channel; /* for stereo MOVs, decode left, then decode right, then tell it's decoded */
     ADPCMChannelStatus status[6];
+    int32_t mxa_current_left_sample; /*Needed to keep track of left and right samples for Maxis EA XA */
+    int32_t mxa_previous_left_sample;
+    int32_t mxa_current_right_sample;
+    int32_t mxa_previous_right_sample;
 } ADPCMContext;
 
 /* XXX: implement encoding */
@@ -669,6 +674,12 @@
     unsigned int max_channels = 2;
 
     switch(avctx->codec->id) {
+    case CODEC_ID_ADPCM_EA_MAXIS_XA://EDITED!!
+	c->mxa_current_left_sample = 0;
+	c->mxa_previous_left_sample = 0;
+	c->mxa_current_right_sample = 0;
+	c->mxa_previous_right_sample = 0;
+	break;
     case CODEC_ID_ADPCM_EA_R1:
     case CODEC_ID_ADPCM_EA_R2:
     case CODEC_ID_ADPCM_EA_R3:
@@ -1235,6 +1246,68 @@
             }
         }
         break;
+    case CODEC_ID_ADPCM_EA_MAXIS_XA:
+        channel = avctx->channels;
+        
+        if(channel > 2) {
+            av_log(avctx, AV_LOG_ERROR, "Only 1 or 2 channels supported");
+            return -1;
+        }
+        
+        coeff1l = ea_adpcm_table[(*src >> 4) & 0x0F];
+        coeff2l = ea_adpcm_table[((*src >> 4) & 0x0F) + 4];
+	shift_left = (*src & 0x0F) + 8;
+	src++;
+
+        if(st) {
+            coeff1r = ea_adpcm_table[(*src >> 4) & 0x0F];
+            coeff2r = ea_adpcm_table[((*src >> 4) & 0x0F) + 4];
+            shift_right = (*src & 0x0F) + 8;
+            src++;
+        }
+
+        for (count1 = 0; count1 < 14 ; count1++) {
+            next_left_sample = ((((*src >> 4) & 0x0F) << 0x1C) >> shift_left);
+            next_left_sample = (next_left_sample +
+                (c->mxa_current_left_sample * coeff1l) +
+                (c->mxa_previous_left_sample * coeff2l) + 0x80) >> 8;
+            c->mxa_previous_left_sample = c->mxa_current_left_sample;
+            c->mxa_current_left_sample = av_clip_int16(next_left_sample);
+            *samples++ = (unsigned short)c->mxa_current_left_sample;
+	
+            next_left_sample = (((*src & 0x0F) << 0x1C) >> shift_left);
+            next_left_sample = (next_left_sample +
+                (c->mxa_current_left_sample * coeff1l) +
+                (c->mxa_previous_left_sample * coeff2l) + 0x80) >> 8;
+            c->mxa_previous_left_sample = c->mxa_current_left_sample;
+            c->mxa_current_left_sample = av_clip_int16(next_left_sample);
+
+            if(st) {
+                src++;
+                next_right_sample = ((((*src >> 4) & 0x0F) << 0x1C) >> shift_right);
+                next_right_sample = (next_right_sample +
+                    (c->mxa_current_right_sample * coeff1r) +
+                    (c->mxa_previous_right_sample * coeff2r) + 0x80) >> 8;
+                c->mxa_previous_right_sample = c->mxa_current_right_sample;
+                c->mxa_current_right_sample = av_clip_int16(next_right_sample);
+                *samples++ = (unsigned short)c->mxa_current_right_sample;
+
+                *samples++ = (unsigned short)c->mxa_current_left_sample;
+
+                next_right_sample = (((*src & 0x0F) << 0x1C) >> shift_right);
+                next_right_sample = (next_right_sample +
+                    (c->mxa_current_right_sample * coeff1r) +
+                    (c->mxa_previous_right_sample * coeff2r) + 0x80) >> 8;
+                c->mxa_previous_right_sample = c->mxa_current_right_sample;
+                c->mxa_current_right_sample = av_clip_int16(next_right_sample);
+                *samples++ = (unsigned short)c->mxa_current_right_sample;	
+            }
+            else {
+                *samples++ = (unsigned short)c->mxa_current_left_sample;
+            }
+            src++;
+        }
+        break;
     case CODEC_ID_ADPCM_EA_R1:
     case CODEC_ID_ADPCM_EA_R2:
     case CODEC_ID_ADPCM_EA_R3: {
@@ -1613,6 +1686,7 @@
 ADPCM_DECODER(CODEC_ID_ADPCM_4XM, adpcm_4xm);
 ADPCM_DECODER(CODEC_ID_ADPCM_CT, adpcm_ct);
 ADPCM_DECODER(CODEC_ID_ADPCM_EA, adpcm_ea);
+ADPCM_DECODER(CODEC_ID_ADPCM_EA_MAXIS_XA, adpcm_ea_maxis_xa);
 ADPCM_DECODER(CODEC_ID_ADPCM_EA_R1, adpcm_ea_r1);
 ADPCM_DECODER(CODEC_ID_ADPCM_EA_R2, adpcm_ea_r2);
 ADPCM_DECODER(CODEC_ID_ADPCM_EA_R3, adpcm_ea_r3);