[Mplayer-cvslog] CVS: main/libmpcodecs ad_msadpcm.c,1.5,1.6

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var/tmp.root/cvs-serv15200

Modified Files:
	ad_msadpcm.c 
Log Message:
bugfix by Keiki SATOH <kki at wakusei.ne.jp>


Index: ad_msadpcm.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_msadpcm.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ad_msadpcm.c	3 Apr 2002 21:37:26 -0000	1.5
+++ ad_msadpcm.c	29 Jun 2002 22:10:18 -0000	1.6
@@ -43,7 +43,7 @@
   0, -256, 0, 64, 0, -208, -232
 };
 
-#define MS_ADPCM_PREAMBLE_SIZE 7
+#define MS_ADPCM_PREAMBLE_SIZE 6
 
 #define LE_16(x) (le2me_16(*(unsigned short *)(x)))
 #define LE_32(x) (le2me_32(*(unsigned int *)(x)))
@@ -157,6 +157,17 @@
     sample2[1] = LE_16(&input[stream_ptr]);
     stream_ptr += 2;
     SE_16BIT(sample2[1]);
+  }
+
+  if (channels == 1)
+  {
+    output[out_ptr++] = sample2[0];
+    output[out_ptr++] = sample1[0];
+  } else {
+    output[out_ptr++] = sample2[0];
+    output[out_ptr++] = sample2[1];
+    output[out_ptr++] = sample1[0];
+    output[out_ptr++] = sample1[1];
   }
 
   while (stream_ptr < block_size)