[SCM] libav/experimental: Cosmetics after last commit
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:45:45 UTC 2013
The following commit has been merged in the experimental branch:
commit f2e5c8b96a4289ca3bf3b76f916d8f791bcb964e
Author: Alex Converse <alex.converse at gmail.com>
Date: Wed May 13 17:59:46 2009 +0000
Cosmetics after last commit
Originally committed as revision 18816 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c
index 90cbb95..85993c0 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;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list