From: Kostya Date: Sat, 22 Jan 2011 13:44:10 +0000 (+0000) Subject: reindent after last commit X-Git-Tag: n0.8~523^2~1081 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=dacbcd170a329dda2014159ca9fc9d11d887625c;p=coroid%2Fffmpeg_saccubus.git reindent after last commit Signed-off-by: Janne Grunau --- diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c index 866cc5987..d7bd265de 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; } diff --git a/libavformat/wv.c b/libavformat/wv.c index d04e00a90..367ce4542 100644 --- a/libavformat/wv.c +++ b/libavformat/wv.c @@ -85,25 +85,25 @@ static int wv_read_block_header(AVFormatContext *ctx, ByteIOContext *pb, int app wc->pos = url_ftell(pb); if(!append){ - tag = get_le32(pb); - if (tag != MKTAG('w', 'v', 'p', 'k')) - return -1; - size = get_le32(pb); - if(size < 24 || size > WV_BLOCK_LIMIT){ - av_log(ctx, AV_LOG_ERROR, "Incorrect block size %i\n", size); - return -1; - } - wc->blksize = size; - ver = get_le16(pb); - if(ver < 0x402 || ver > 0x410){ - av_log(ctx, AV_LOG_ERROR, "Unsupported version %03X\n", ver); - return -1; - } - get_byte(pb); // track no - get_byte(pb); // track sub index - wc->samples = get_le32(pb); // total samples in file - wc->soff = get_le32(pb); // offset in samples of current block - get_buffer(pb, wc->extra, WV_EXTRA_SIZE); + tag = get_le32(pb); + if (tag != MKTAG('w', 'v', 'p', 'k')) + return -1; + size = get_le32(pb); + if(size < 24 || size > WV_BLOCK_LIMIT){ + av_log(ctx, AV_LOG_ERROR, "Incorrect block size %i\n", size); + return -1; + } + wc->blksize = size; + ver = get_le16(pb); + if(ver < 0x402 || ver > 0x410){ + av_log(ctx, AV_LOG_ERROR, "Unsupported version %03X\n", ver); + return -1; + } + get_byte(pb); // track no + get_byte(pb); // track sub index + wc->samples = get_le32(pb); // total samples in file + wc->soff = get_le32(pb); // offset in samples of current block + get_buffer(pb, wc->extra, WV_EXTRA_SIZE); }else{ size = wc->blksize; }