har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reindent after last commit

Browse Source 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit dacbcd170a329dda2014159ca9fc9d11d887625c)
This commit is contained in:
Kostya 2011-01-22 13:44:10 +00:00 committed by Michael Niedermayer
parent 8a485dd399
commit 69c78161d2
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/wavpack.c
View File

@ -706,7 +706,7 @@ static av_cold int wavpack_decode_init(AVCodecContext *avctx)
else else
avctx->sample_fmt = AV_SAMPLE_FMT_S32; avctx->sample_fmt = AV_SAMPLE_FMT_S32;
if(avctx->channels <= 2 && !avctx->channel_layout) 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; s->multichannel = avctx->channels > 2;
/* lavf demuxer does not provide extradata, Matroska stores 0x403 /* 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){ if(!wc->mkv_mode){
s->samples = AV_RL32(buf); buf += 4; s->samples = AV_RL32(buf); buf += 4;
if(!s->samples){ if(!s->samples){
*data_size = 0; *data_size = 0;
return buf_size; return buf_size;
} }
}else{ }else{
s->samples = wc->samples; s->samples = wc->samples;
} }

38
libavformat/wv.c
View File

@ -85,25 +85,25 @@ static int wv_read_block_header(AVFormatContext *ctx, ByteIOContext *pb, int app
wc->pos = url_ftell(pb); wc->pos = url_ftell(pb);
if(!append){ if(!append){
tag = get_le32(pb); tag = get_le32(pb);
if (tag != MKTAG('w', 'v', 'p', 'k')) if (tag != MKTAG('w', 'v', 'p', 'k'))
return -1; return -1;
size = get_le32(pb); size = get_le32(pb);
if(size < 24 || size > WV_BLOCK_LIMIT){ if(size < 24 || size > WV_BLOCK_LIMIT){
av_log(ctx, AV_LOG_ERROR, "Incorrect block size %i\n", size); av_log(ctx, AV_LOG_ERROR, "Incorrect block size %i\n", size);
return -1; return -1;
} }
wc->blksize = size; wc->blksize = size;
ver = get_le16(pb); ver = get_le16(pb);
if(ver < 0x402 || ver > 0x410){ if(ver < 0x402 || ver > 0x410){
av_log(ctx, AV_LOG_ERROR, "Unsupported version %03X\n", ver); av_log(ctx, AV_LOG_ERROR, "Unsupported version %03X\n", ver);
return -1; return -1;
} }
get_byte(pb); // track no get_byte(pb); // track no
get_byte(pb); // track sub index get_byte(pb); // track sub index
wc->samples = get_le32(pb); // total samples in file wc->samples = get_le32(pb); // total samples in file
wc->soff = get_le32(pb); // offset in samples of current block wc->soff = get_le32(pb); // offset in samples of current block
get_buffer(pb, wc->extra, WV_EXTRA_SIZE); get_buffer(pb, wc->extra, WV_EXTRA_SIZE);
}else{ }else{
size = wc->blksize; size = wc->blksize;
} }