[SCM] libav/experimental: * minor optimalization
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:35:29 UTC 2013
The following commit has been merged in the experimental branch:
commit 6b9b85c165ae71e38f41d64e9bb1adf13cbb253f
Author: Zdenek Kabelac <kabi at informatics.muni.cz>
Date: Mon Mar 3 17:13:26 2003 +0000
* minor optimalization
Originally committed as revision 1618 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index 0c4e722..8f6863c 100644
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -427,18 +427,19 @@ static int adpcm_decode_frame(AVCodecContext *avctx,
src++; /* if != 0 -> out-of-sync */
}
- for(m=3; src < (buf + buf_size);) {
- *samples++ = adpcm_ima_expand_nibble(&c->status[0], src[0] & 0x0F);
+ for(m=4; src < (buf + buf_size);) {
+ *samples++ = adpcm_ima_expand_nibble(&c->status[0], src[0] & 0x0F);
if (st)
*samples++ = adpcm_ima_expand_nibble(&c->status[1], src[4] & 0x0F);
*samples++ = adpcm_ima_expand_nibble(&c->status[0], (src[0] >> 4) & 0x0F);
- if (st)
+ if (st) {
*samples++ = adpcm_ima_expand_nibble(&c->status[1], (src[4] >> 4) & 0x0F);
- src++;
- if (st && !m--) {
- m=3;
- src+=4;
- }
+ if (!--m) {
+ m=4;
+ src+=4;
+ }
+ }
+ src++;
}
break;
case CODEC_ID_ADPCM_MS:
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list