diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-19 21:46:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-19 21:46:32 +0100 |
| commit | 10f1ee2f923a700879687bc844b9deca7e750846 (patch) | |
| tree | a7ebf34723f904c996b486e350d5729410a16c09 | |
| parent | 3a5a039adee3ee928898df82e20c40212d618195 (diff) | |
| parent | ade75fb811500f3e3f284737f123938d83be728f (diff) | |
Merge commit 'ade75fb811500f3e3f284737f123938d83be728f'
* commit 'ade75fb811500f3e3f284737f123938d83be728f':
(e)ac3: clip surround mix level indexes.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/ac3dec.c | 4 | ||||
| -rw-r--r-- | libavcodec/eac3dec.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index 62f88d042a..6842e9e207 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -237,9 +237,9 @@ static int ac3_parse_header(AC3DecodeContext *s) if (get_bits1(gbc)) { s->preferred_downmix = get_bits(gbc, 2); s->center_mix_level_ltrt = get_bits(gbc, 3); - s->surround_mix_level_ltrt = get_bits(gbc, 3); + s->surround_mix_level_ltrt = av_clip(get_bits(gbc, 3), 3, 7); s->center_mix_level = get_bits(gbc, 3); - s->surround_mix_level = get_bits(gbc, 3); + s->surround_mix_level = av_clip(get_bits(gbc, 3), 3, 7); } if (get_bits1(gbc)) { s->dolby_surround_ex_mode = get_bits(gbc, 2); diff --git a/libavcodec/eac3dec.c b/libavcodec/eac3dec.c index 1d75627b71..a711c5c3a2 100644 --- a/libavcodec/eac3dec.c +++ b/libavcodec/eac3dec.c @@ -353,8 +353,8 @@ int ff_eac3_parse_header(AC3DecodeContext *s) } if (s->channel_mode & 4) { /* if a surround channel exists */ - s->surround_mix_level_ltrt = get_bits(gbc, 3); - s->surround_mix_level = get_bits(gbc, 3); + s->surround_mix_level_ltrt = av_clip(get_bits(gbc, 3), 3, 7); + s->surround_mix_level = av_clip(get_bits(gbc, 3), 3, 7); } } |