RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '35596bd4f4d3c39eed838cf3a2613817d62dda99' 

* commit '35596bd4f4d3c39eed838cf3a2613817d62dda99':
  wavpack: remove a useless parameter from wavpack_decode_block().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-05-28 11:35:02 +02:00
parent f5dfc35157 35596bd4f4
commit 288e3fdfd3
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/wavpack.c
View File

@ -758,8 +758,7 @@ static av_cold int wavpack_decode_end(AVCodecContext *avctx)
}
static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
uint8_t **data, int *got_frame_ptr,
const uint8_t *buf, int buf_size)
uint8_t **data, const uint8_t *buf, int buf_size)
{
WavpackContext *wc = avctx->priv_data;
WavpackFrameContext *s;
@ -1139,8 +1138,6 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
memcpy(samples_r, samples_l, bpp * s->samples);
}
*got_frame_ptr = 1;
return 0;
}
@ -1225,7 +1222,7 @@ static int wavpack_decode_frame(AVCodecContext *avctx, void *data,
return AVERROR_INVALIDDATA;
}
if ((ret = wavpack_decode_block(avctx, s->block,
frame->extended_data, got_frame_ptr,
frame->extended_data,
buf, frame_size)) < 0) {
wavpack_decode_flush(avctx);
return ret;
@ -1235,6 +1232,8 @@ static int wavpack_decode_frame(AVCodecContext *avctx, void *data,
buf_size -= frame_size;
}
*got_frame_ptr = 1;
return avpkt->size;
}