AVCodecContext *avctx = ac->avccontext;
int i, type, channels = 0;
- if(!memcmp(che_pos, new_che_pos, 4 * MAX_ELEM_ID * sizeof(new_che_pos[0][0])))
- return 0; /* no change */
-
memcpy(che_pos, new_che_pos, 4 * MAX_ELEM_ID * sizeof(new_che_pos[0][0]));
/* Allocate or free elements depending on if they are in the
if(output_configure(ac, ac->che_pos, new_che_pos, 1))
return -1;
ac->m4ac.sample_rate = avccontext->sample_rate;
- } else {
- ff_log_missing_feature(ac->avccontext, "Implicit channel configuration is", 0);
- return -1;
}
avccontext->sample_fmt = SAMPLE_FMT_S16;
avctx->codec_id == CODEC_ID_EAC3)))) {
avctx->channels = avctx->request_channels;
} 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;
skip_bits1(gbc); /* private_bit */
ch = get_bits(gbc, 3); /* channel_configuration */
- if(!ff_mpeg4audio_channels[ch])
- return AAC_AC3_PARSE_ERROR_CHANNEL_CFG;
-
skip_bits1(gbc); /* original/copy */
skip_bits1(gbc); /* home */