summaryrefslogtreecommitdiff
path: root/libavcodec/wavpack.c
diff options
context:
space:
mode:
authorKostya <kostya.shishkov@gmail.com>2011-01-22 13:44:10 +0000
committerJanne Grunau <janne-ffmpeg@jannau.net>2011-01-24 20:46:58 +0100
commitdacbcd170a329dda2014159ca9fc9d11d887625c (patch)
tree57c38f91056d0551e1673893ba91d75568044463 /libavcodec/wavpack.c
parent3bdc886c22710d3207b1bd75f8d2d65ec77cace5 (diff)
reindent after last commit
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
Diffstat (limited to 'libavcodec/wavpack.c')
-rw-r--r--libavcodec/wavpack.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c
index 866cc59879..d7bd265de0 100644
--- a/libavcodec/wavpack.c
+++ b/libavcodec/wavpack.c
@@ -706,7 +706,7 @@ static av_cold int wavpack_decode_init(AVCodecContext *avctx)
else
avctx->sample_fmt = AV_SAMPLE_FMT_S32;
if(avctx->channels <= 2 && !avctx->channel_layout)
- avctx->channel_layout = (avctx->channels==2) ? CH_LAYOUT_STEREO : CH_LAYOUT_MONO;
+ avctx->channel_layout = (avctx->channels==2) ? CH_LAYOUT_STEREO : CH_LAYOUT_MONO;
s->multichannel = avctx->channels > 2;
/* lavf demuxer does not provide extradata, Matroska stores 0x403
@@ -775,11 +775,11 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
}
if(!wc->mkv_mode){
- s->samples = AV_RL32(buf); buf += 4;
- if(!s->samples){
- *data_size = 0;
- return buf_size;
- }
+ s->samples = AV_RL32(buf); buf += 4;
+ if(!s->samples){
+ *data_size = 0;
+ return buf_size;
+ }
}else{
s->samples = wc->samples;
}