aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Converse <alex.converse@gmail.com>2009-05-13 17:59:46 +0000
committerAlex Converse <alex.converse@gmail.com>2009-05-13 17:59:46 +0000
commitf2e5c8b96a4289ca3bf3b76f916d8f791bcb964e (patch)
tree4270b8e39f14051ea9c3d36f0245fac433320aae
parent90350d73f8b6bb281d9028ad1adf4805a8bce717 (diff)
downloadffmpeg-f2e5c8b96a4289ca3bf3b76f916d8f791bcb964e.tar.gz
Cosmetics after last commit
Originally committed as revision 18816 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/aac_ac3_parser.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c
index 90cbb9535c..85993c09b7 100644
--- a/libavcodec/aac_ac3_parser.c
+++ b/libavcodec/aac_ac3_parser.c
@@ -83,11 +83,9 @@ get_next:
(avctx->codec_id == CODEC_ID_AC3 ||
avctx->codec_id == CODEC_ID_EAC3)))) {
avctx->channels = avctx->request_channels;
- } else {
- if (avctx->codec_id != CODEC_ID_AAC || s->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;