diff options
| author | Kostya <kostya.shishkov@gmail.com> | 2011-01-22 13:44:10 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-01-26 03:43:28 +0100 |
| commit | 69c78161d265863b1e3ef24f915d88f170135e37 (patch) | |
| tree | cf5a9c843ee35665db0c9a46a41854e7f841f5d3 /libavcodec/wavpack.c | |
| parent | 8a485dd399b51d4744ccfc0d7c8c21bcf400b00a (diff) | |
reindent after last commit
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit dacbcd170a329dda2014159ca9fc9d11d887625c)
Diffstat (limited to 'libavcodec/wavpack.c')
| -rw-r--r-- | libavcodec/wavpack.c | 12 |
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; } |