summaryrefslogtreecommitdiff
path: root/libavcodec/adpcm.c
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2003-10-22 22:10:22 +0000
committerAlex Beregszaszi <alex@rtfs.hu>2003-10-22 22:10:22 +0000
commit1ffb0091aa3c05bd851bd926ce79b7451894b6dc (patch)
tree680ffd1060ba5ca233f601db893dddc21b1400fa /libavcodec/adpcm.c
parent6f5cf8c50f02389d4f222c360156f1d45ec082e0 (diff)
100l
Originally committed as revision 2417 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/adpcm.c')
-rw-r--r--libavcodec/adpcm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index 9e5312663c..a6ecaf5432 100644
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -89,7 +89,7 @@ static const int AdaptCoeff2[] = {
};
/* These are for CD-ROM XA ADPCM */
-const static int xa_adpcm_table[5][2] = {
+static const int xa_adpcm_table[5][2] = {
{ 0, 0 },
{ 60, 0 },
{ 115, -52 },
@@ -235,7 +235,7 @@ static int adpcm_encode_frame(AVCodecContext *avctx,
*dst++ = 0; /* unknown */
samples++;
if (avctx->channels == 2) {
- c->status[1].prev_sample = (signed short)samples[0];
+ c->status[1].prev_sample = (signed short)samples[1];
/* c->status[1].step_index = 0; */
*dst++ = (c->status[1].prev_sample) & 0xFF;
*dst++ = (c->status[1].prev_sample >> 8) & 0xFF;