diff options
author | Kostya <kostya.shishkov@gmail.com> | 2011-01-22 13:44:10 +0000 |
---|---|---|
committer | Janne Grunau <janne-ffmpeg@jannau.net> | 2011-01-24 20:46:58 +0100 |
commit | dacbcd170a329dda2014159ca9fc9d11d887625c (patch) | |
tree | 57c38f91056d0551e1673893ba91d75568044463 | |
parent | 3bdc886c22710d3207b1bd75f8d2d65ec77cace5 (diff) | |
download | ffmpeg-dacbcd170a329dda2014159ca9fc9d11d887625c.tar.gz |
reindent after last commit
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
-rw-r--r-- | libavcodec/wavpack.c | 12 | ||||
-rw-r--r-- | libavformat/wv.c | 38 |
2 files changed, 25 insertions, 25 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; } diff --git a/libavformat/wv.c b/libavformat/wv.c index d04e00a90a..367ce45423 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; } |