virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

wavpack: remove a useless parameter from wavpack_decode_block().

Browse Source 
The decoder always returns output if an error does not occur.
This commit is contained in:
Anton Khirnov
2013-05-26 10:47:22 +02:00
parent d1bec4be22
commit 35596bd4f4
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/wavpack.c
View File

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