OSDN Git Service
(root)
/
coroid
/
libav_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ddcf031
)
10l, forgot to replace a / 256 for r14173.
author
Reimar Döffinger
<Reimar.Doeffinger@gmx.de>
Sat, 12 Jul 2008 07:28:45 +0000
(07:28 +0000)
committer
Reimar Döffinger
<Reimar.Doeffinger@gmx.de>
Sat, 12 Jul 2008 07:28:45 +0000
(07:28 +0000)
Fixes MS ADPCM regression test.
Originally committed as revision 14174 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/adpcm.c
patch
|
blob
|
history
diff --git
a/libavcodec/adpcm.c
b/libavcodec/adpcm.c
index
06dfdcc
..
f37c10e
100644
(file)
--- a/
libavcodec/adpcm.c
+++ b/
libavcodec/adpcm.c
@@
-732,7
+732,7
@@
static inline short adpcm_ms_expand_nibble(ADPCMChannelStatus *c, char nibble)
{
int predictor;
- predictor = (((c->sample1) * (c->coeff1)) + ((c->sample2) * (c->coeff2))) /
256
;
+ predictor = (((c->sample1) * (c->coeff1)) + ((c->sample2) * (c->coeff2))) /
64
;
predictor += (signed)((nibble & 0x08)?(nibble - 0x10):(nibble)) * c->idelta;
c->sample2 = c->sample1;