diff options
author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-04-25 15:06:07 +0000 |
---|---|---|
committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-04-25 15:06:07 +0000 |
commit | d29ee34ce31668703913f9e9c5dc3b8df969addd (patch) | |
tree | 333da32f6854b2640aa809b76fd72d52e5c64157 /libavcodec/adpcm.c | |
parent | 45a97d301871e467d8cc01847a41357beb30065c (diff) | |
download | ffmpeg-streaming-d29ee34ce31668703913f9e9c5dc3b8df969addd.zip ffmpeg-streaming-d29ee34ce31668703913f9e9c5dc3b8df969addd.tar.gz |
fix adpcm ima qt decoding, channel at init is 0, correct stereo out since samples += avctx->channels
Originally committed as revision 12965 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/adpcm.c')
-rw-r--r-- | libavcodec/adpcm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 1c4f275..6152457 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -959,9 +959,10 @@ static int adpcm_decode_frame(AVCodecContext *avctx, if(st) { /* handle stereo interlacing */ c->channel = (channel + 1) % 2; /* we get one packet for left, then one for right data */ - if(channel == 1) { /* wait for the other packet before outputing anything */ + if(!channel) { /* wait for the other packet before outputing anything */ return src - buf; } + samples--; } break; case CODEC_ID_ADPCM_IMA_WAV: |