diff options
| author | Alex Converse <alex.converse@gmail.com> | 2010-03-04 02:32:48 +0000 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2010-03-04 02:32:48 +0000 |
| commit | 65bec42e33dde457cbd7b9841c028460c0467b49 (patch) | |
| tree | c5cb34a55ce1e6e6a4d3eef4571ccdf04ffa05a6 /libavcodec | |
| parent | ca1fa4144fbde99a88589c4b02648980b7d4c2d8 (diff) | |
| download | ffmpeg-65bec42e33dde457cbd7b9841c028460c0467b49.tar.gz | |
Cosmetics: Re-indent after last commit.
Originally committed as revision 22195 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/aac_ac3_parser.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c index 83ad9c56f9..87911619eb 100644 --- a/libavcodec/aac_ac3_parser.c +++ b/libavcodec/aac_ac3_parser.c @@ -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; |