Merge commit '48b24bd2d208ce0f124029ac4c5ac5cb1fca4175'

* commit '48b24bd2d208ce0f124029ac4c5ac5cb1fca4175':
  ac3dec: Fix out-of-array read

Conflicts:
	libavcodec/ac3dec.c

See: 2cbf27b08a4991de608b305a8600b59467587605
Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/ac3dec.c
index 44b5f44,7172e63..82345cd
--- 1/libavcodec/ac3dec.c
--- 2/libavcodec/ac3dec.c
+++ b/libavcodec/ac3dec.c
@@@ -1367,15 -1367,7 +1367,11 @@@ static int ac3_decode_frame(AVCodecCont
              s->out_channels = 2;
              s->output_mode  = AC3_CHMODE_STEREO;
          }
-         avctx->channels       = s->out_channels;
-         avctx->channel_layout = avpriv_ac3_channel_layout_tab[s->output_mode & ~AC3_OUTPUT_LFEON];
-         if (s->output_mode & AC3_OUTPUT_LFEON)
-             avctx->channel_layout |= AV_CH_LOW_FREQUENCY;
  
 +        s->loro_center_mix_level   = gain_levels[s->  center_mix_level];
 +        s->loro_surround_mix_level = gain_levels[s->surround_mix_level];
 +        s->ltrt_center_mix_level   = LEVEL_MINUS_3DB;
 +        s->ltrt_surround_mix_level = LEVEL_MINUS_3DB;
          /* set downmixing coefficients if needed */
          if (s->channels != s->out_channels && !((s->output_mode & AC3_OUTPUT_LFEON) &&
                  s->fbw_channels == s->out_channels)) {