aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-04-19 10:48:50 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-04-19 10:48:50 +0000
commit7bc5f6e53ecf3adc4e4c73e8e9347a4e4418397c (patch)
treebde3bd8b3f1a8ccfb790049e2b9a4810cac61d1b
parent12eef728bf746f3994cdb7af03bd7fbd2ac2e6cd (diff)
downloadffmpeg-7bc5f6e53ecf3adc4e4c73e8e9347a4e4418397c.tar.gz
indent
Originally committed as revision 12901 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/aac_ac3_parser.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c
index 64ee767b14..189bdb4d15 100644
--- a/libavcodec/aac_ac3_parser.c
+++ b/libavcodec/aac_ac3_parser.c
@@ -67,20 +67,20 @@ get_next:
*poutbuf = buf;
*poutbuf_size = buf_size;
- /* update codec info */
- avctx->sample_rate = s->sample_rate;
- /* allow downmixing to stereo (or mono for AC3) */
- 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->channels = avctx->request_channels;
- } else {
- avctx->channels = s->channels;
- }
- avctx->bit_rate = s->bit_rate;
- avctx->frame_size = s->samples;
+ /* update codec info */
+ avctx->sample_rate = s->sample_rate;
+ /* allow downmixing to stereo (or mono for AC3) */
+ 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->channels = avctx->request_channels;
+ } else {
+ avctx->channels = s->channels;
+ }
+ avctx->bit_rate = s->bit_rate;
+ avctx->frame_size = s->samples;
return i;
}