Mercurial > mplayer.hg

changeset 6609:7745d73a5f20

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bugfix by Keiki SATOH <kki@wakusei.ne.jp>
author arpi
date Sat, 29 Jun 2002 22:10:18 +0000
parents da27a1bc1763
children 242d1b98a15f
files libmpcodecs/ad_msadpcm.c
diffstat 1 files changed, 12 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libmpcodecs/ad_msadpcm.c	Sat Jun 29 21:43:28 2002 +0000
+++ b/libmpcodecs/ad_msadpcm.c	Sat Jun 29 22:10:18 2002 +0000
@@ -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)))
@@ -159,6 +159,17 @@
     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)
   {
     // get the next nibble