Commit f2e5c8b9 authored by Alex Converse's avatar Alex Converse

Cosmetics after last commit

Originally committed as revision 18816 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 90350d73
...@@ -83,11 +83,9 @@ get_next: ...@@ -83,11 +83,9 @@ get_next:
(avctx->codec_id == CODEC_ID_AC3 || (avctx->codec_id == CODEC_ID_AC3 ||
avctx->codec_id == CODEC_ID_EAC3)))) { avctx->codec_id == CODEC_ID_EAC3)))) {
avctx->channels = avctx->request_channels; avctx->channels = avctx->request_channels;
} else { } else if (avctx->codec_id != CODEC_ID_AAC || s->channels) {
if (avctx->codec_id != CODEC_ID_AAC || s->channels) {
avctx->channels = s->channels; avctx->channels = s->channels;
avctx->channel_layout = s->channel_layout; avctx->channel_layout = s->channel_layout;
}
} }
avctx->bit_rate = s->bit_rate; avctx->bit_rate = s->bit_rate;
avctx->frame_size = s->samples; avctx->frame_size = s->samples;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment