diff options
| author | Rodger Combs <rodger.combs@gmail.com> | 2015-11-25 14:53:06 -0600 |
|---|---|---|
| committer | Rodger Combs <rodger.combs@gmail.com> | 2016-02-27 16:31:46 -0600 |
| commit | f0ea536c47c88f5bbf3b65f77c8f142f7b3f5c2b (patch) | |
| tree | 772009847c37a197ff3d8a08514947399b7570ba | |
| parent | 9f5baf90856f8afa0d94c2bf1dc31f485ef72a13 (diff) | |
| download | ffmpeg-f0ea536c47c88f5bbf3b65f77c8f142f7b3f5c2b.tar.gz | |
lavc/aac_ac3_parser: reindent
| -rw-r--r-- | libavcodec/aac_ac3_parser.c | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c index 6a76eb8ec2..c9ba6bf062 100644 --- a/libavcodec/aac_ac3_parser.c +++ b/libavcodec/aac_ac3_parser.c @@ -79,31 +79,32 @@ get_next: avctx->codec_id = s->codec_id; if (got_frame) { - /* Due to backwards compatible HE-AAC the sample rate, channel count, - and total number of samples found in an AAC ADTS header are not - reliable. Bit rate is still accurate because the total frame duration in - seconds is still correct (as is the number of bits in the frame). */ - if (avctx->codec_id != AV_CODEC_ID_AAC) { - avctx->sample_rate = s->sample_rate; + /* Due to backwards compatible HE-AAC the sample rate, channel count, + and total number of samples found in an AAC ADTS header are not + reliable. Bit rate is still accurate because the total frame + duration in seconds is still correct (as is the number of bits in + the frame). */ + if (avctx->codec_id != AV_CODEC_ID_AAC) { + avctx->sample_rate = s->sample_rate; - /* (E-)AC-3: allow downmixing to stereo or mono */ - if (s->channels > 1 && - avctx->request_channel_layout == AV_CH_LAYOUT_MONO) { - avctx->channels = 1; - avctx->channel_layout = AV_CH_LAYOUT_MONO; - } else if (s->channels > 2 && - avctx->request_channel_layout == AV_CH_LAYOUT_STEREO) { - avctx->channels = 2; - avctx->channel_layout = AV_CH_LAYOUT_STEREO; - } else { - avctx->channels = s->channels; - avctx->channel_layout = s->channel_layout; + /* (E-)AC-3: allow downmixing to stereo or mono */ + if (s->channels > 1 && + avctx->request_channel_layout == AV_CH_LAYOUT_MONO) { + avctx->channels = 1; + avctx->channel_layout = AV_CH_LAYOUT_MONO; + } else if (s->channels > 2 && + avctx->request_channel_layout == AV_CH_LAYOUT_STEREO) { + avctx->channels = 2; + avctx->channel_layout = AV_CH_LAYOUT_STEREO; + } else { + avctx->channels = s->channels; + avctx->channel_layout = s->channel_layout; + } + s1->duration = s->samples; + avctx->audio_service_type = s->service_type; } - s1->duration = s->samples; - avctx->audio_service_type = s->service_type; - } - avctx->bit_rate = s->bit_rate; + avctx->bit_rate = s->bit_rate; } return i; |