Revision bfeca7be libavcodec/ac3dec.c

View differences:

libavcodec/ac3dec.c
285 285
    /* get decoding parameters from header info */
286 286
    s->bit_alloc_params.sr_code     = hdr.sr_code;
287 287
    s->channel_mode                 = hdr.channel_mode;
288
    s->channel_layout               = hdr.channel_layout;
288 289
    s->lfe_on                       = hdr.lfe_on;
289 290
    s->bit_alloc_params.sr_shift    = hdr.sr_shift;
290 291
    s->sample_rate                  = hdr.sample_rate;
......
1307 1308
                avctx->request_channels < s->channels) {
1308 1309
            s->out_channels = avctx->request_channels;
1309 1310
            s->output_mode  = avctx->request_channels == 1 ? AC3_CHMODE_MONO : AC3_CHMODE_STEREO;
1311
            s->channel_layout = ff_ac3_channel_layout_tab[s->output_mode];
1310 1312
        }
1311 1313
        avctx->channels = s->out_channels;
1314
        avctx->channel_layout = s->channel_layout;
1312 1315

  
1313 1316
        /* set downmixing coefficients if needed */
1314 1317
        if(s->channels != s->out_channels && !((s->output_mode & AC3_OUTPUT_LFEON) &&

Also available in: Unified diff