/* update codec info */
avctx->sample_rate = s->sample_rate;
+ if(s->codec_id)
+ avctx->codec_id = s->codec_id;
+
/* allow downmixing to stereo (or mono for AC-3) */
if(avctx->request_channels > 0 &&
avctx->request_channels < s->channels &&
(avctx->codec_id == CODEC_ID_AC3 ||
avctx->codec_id == CODEC_ID_EAC3)))) {
avctx->channels = avctx->request_channels;
- } else {
+ } else if (avctx->codec_id != CODEC_ID_AAC || s->channels) {
avctx->channels = s->channels;
+ avctx->channel_layout = s->channel_layout;
}
avctx->bit_rate = s->bit_rate;
avctx->frame_size = s->samples;