generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

apedec: do not needlessly copy s->samples to nblocks.

Browse Source 
also move nblocks to the local scope where it is used.
This commit is contained in:
Justin Ruggles 2011-10-31 15:10:19 -04:00
parent 4315c7d35a
commit de157f2118
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/apedec.c
View File

@ -814,7 +814,6 @@ static int ape_decode_frame(AVCodecContext *avctx,
int buf_size = avpkt->size;
APEContext *s = avctx->priv_data;
int16_t *samples = data;
uint32_t nblocks;
int i;
int blockstodecode, out_size;
int bytes_used;
@ -824,7 +823,7 @@ static int ape_decode_frame(AVCodecContext *avctx,
av_assert0(s->samples >= 0);
if(!s->samples){
uint32_t offset;
uint32_t nblocks, offset;
void *tmp_data;
if (buf_size < 8) {
@ -874,8 +873,7 @@ static int ape_decode_frame(AVCodecContext *avctx,
return buf_size;
}
nblocks = s->samples;
blockstodecode = FFMIN(BLOCKS_PER_LOOP, nblocks);
blockstodecode = FFMIN(BLOCKS_PER_LOOP, s->samples);
out_size = blockstodecode * avctx->channels *
av_get_bytes_per_sample(avctx->sample_fmt);