Mercurial > libavcodec.hg

comparison aac_ac3_parser.c @ 9635:4d13e2e2503a libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cosmetics after last commit
author alexc
date Wed, 13 May 2009 17:59:46 +0000
parents 61c62ab2218f
children 9056fd765255
comparison
equal deleted inserted replaced
9634:61c62ab2218f 9635:4d13e2e2503a
81 (avctx->request_channels <= 2 || 81 (avctx->request_channels <= 2 ||
82 (avctx->request_channels == 1 && 82 (avctx->request_channels == 1 &&
83 (avctx->codec_id == CODEC_ID_AC3 || 83 (avctx->codec_id == CODEC_ID_AC3 ||
84 avctx->codec_id == CODEC_ID_EAC3)))) { 84 avctx->codec_id == CODEC_ID_EAC3)))) {
85 avctx->channels = avctx->request_channels; 85 avctx->channels = avctx->request_channels;
86 } else { 86 } else if (avctx->codec_id != CODEC_ID_AAC || s->channels) {
87 if (avctx->codec_id != CODEC_ID_AAC || s->channels) {
88 avctx->channels = s->channels; 87 avctx->channels = s->channels;
89 avctx->channel_layout = s->channel_layout; 88 avctx->channel_layout = s->channel_layout;
90 }
91 } 89 }
92 avctx->bit_rate = s->bit_rate; 90 avctx->bit_rate = s->bit_rate;
93 avctx->frame_size = s->samples; 91 avctx->frame_size = s->samples;
94 92
95 return i; 93 return i;