[FFmpeg-cvslog] r22195 - trunk/libavcodec/aac_ac3_parser.c
alexc
subversion
Thu Mar 4 03:32:49 CET 2010
Author: alexc
Date: Thu Mar 4 03:32:48 2010
New Revision: 22195
Log:
Cosmetics: Re-indent after last commit.
Modified:
trunk/libavcodec/aac_ac3_parser.c
Modified: trunk/libavcodec/aac_ac3_parser.c
==============================================================================
--- trunk/libavcodec/aac_ac3_parser.c Thu Mar 4 03:30:51 2010 (r22194)
+++ trunk/libavcodec/aac_ac3_parser.c Thu Mar 4 03:32:48 2010 (r22195)
@@ -81,19 +81,19 @@ get_next:
if (avctx->codec_id != CODEC_ID_AAC) {
avctx->sample_rate = s->sample_rate;
- /* allow downmixing to stereo (or mono for AC-3) */
- if(avctx->request_channels > 0 &&
- avctx->request_channels < s->channels &&
- (avctx->request_channels <= 2 ||
- (avctx->request_channels == 1 &&
- (avctx->codec_id == CODEC_ID_AC3 ||
- avctx->codec_id == CODEC_ID_EAC3)))) {
- avctx->channels = avctx->request_channels;
- } else {
- avctx->channels = s->channels;
- avctx->channel_layout = s->channel_layout;
- }
- avctx->frame_size = s->samples;
+ /* allow downmixing to stereo (or mono for AC-3) */
+ if(avctx->request_channels > 0 &&
+ avctx->request_channels < s->channels &&
+ (avctx->request_channels <= 2 ||
+ (avctx->request_channels == 1 &&
+ (avctx->codec_id == CODEC_ID_AC3 ||
+ avctx->codec_id == CODEC_ID_EAC3)))) {
+ avctx->channels = avctx->request_channels;
+ } else {
+ avctx->channels = s->channels;
+ avctx->channel_layout = s->channel_layout;
+ }
+ avctx->frame_size = s->samples;
}
avctx->bit_rate = s->bit_rate;
More information about the ffmpeg-cvslog
mailing list