[FFmpeg-cvslog] (e)ac3: clip surround mix level indexes.

[Tim Walker]

ffmpeg | branch: master | Tim Walker <tdskywalker at gmail.com> | Fri Jan 17 16:06:34 2014 +0100| [ade75fb811500f3e3f284737f123938d83be728f] | committer: Tim Walker

(e)ac3: clip surround mix level indexes.

Values 0-2 are reserved, 3 (-1.5dB) should be used instead.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ade75fb811500f3e3f284737f123938d83be728f
---

 libavcodec/ac3dec.c  |    4 ++--
 libavcodec/eac3dec.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c
index b6ee401..2cceadc 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 dfd78c6..95ee33f 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);
             }
         }