OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
95234e0
)
ac3enc: Remove unneeded clipping of shift amount.
author
Justin Ruggles
<justin.ruggles@gmail.com>
Thu, 10 Feb 2011 22:12:16 +0000
(22:12 +0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 11 Feb 2011 01:54:10 +0000
(
02:54
+0100)
s->windowed_samples will always have a range of [-32767,32767] due to the
window function, so the return value from log2_tab() will always be in the
range [0,14].
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
626264b11b5406c0c78c4056cabb63cb650e9bf2
)
libavcodec/ac3enc_fixed.c
patch
|
blob
|
history
diff --git
a/libavcodec/ac3enc_fixed.c
b/libavcodec/ac3enc_fixed.c
index
ff400b8
..
0db41df
100644
(file)
--- a/
libavcodec/ac3enc_fixed.c
+++ b/
libavcodec/ac3enc_fixed.c
@@
-309,7
+309,6
@@
static void lshift_tab(int16_t *tab, int n, unsigned int lshift)
static int normalize_samples(AC3EncodeContext *s)
{
int v = 14 - log2_tab(s->windowed_samples, AC3_WINDOW_SIZE);
- v = FFMAX(0, v);
lshift_tab(s->windowed_samples, AC3_WINDOW_SIZE, v);
return v - 9;
}