git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d326dd9
)
prevent crash when dba params are invalid
author
Justin Ruggles
<justin.ruggles@gmail.com>
Tue, 3 Jun 2008 23:34:26 +0000
(23:34 +0000)
committer
Justin Ruggles
<justin.ruggles@gmail.com>
Tue, 3 Jun 2008 23:34:26 +0000
(23:34 +0000)
Originally committed as revision 13653 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/ac3.c
patch
|
blob
|
history
diff --git
a/libavcodec/ac3.c
b/libavcodec/ac3.c
index
a1415a5
..
132ea0f
100644
(file)
--- a/
libavcodec/ac3.c
+++ b/
libavcodec/ac3.c
@@
-157,8
+157,8
@@
void ff_ac3_bit_alloc_calc_mask(AC3BitAllocParameters *s, int16_t *band_psd,
if (dba_mode == DBA_REUSE || dba_mode == DBA_NEW) {
int band, seg, delta;
band = 0;
- for (seg = 0; seg <
dba_nsegs
; seg++) {
- band
+= dba_offsets[seg]
;
+ for (seg = 0; seg <
FFMIN(8, dba_nsegs)
; seg++) {
+ band
= FFMIN(49, band + dba_offsets[seg])
;
if (dba_values[seg] >= 4) {
delta = (dba_values[seg] - 3) << 7;
} else {