mirror of https://git.ffmpeg.org/ffmpeg.git
avcodec/g729dec: require buf_size to be non 0
The 0 case was added with the support for multiple packets. It appears unintended and causes extra complexity and out of array accesses (though within padding) No testcase Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
d468da8d79
commit
f64be9da4c
|
@ -427,7 +427,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr,
|
||||||
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
|
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
if (buf_size % ((G729_8K_BLOCK_SIZE + (avctx->codec_id == AV_CODEC_ID_ACELP_KELVIN)) * avctx->channels) == 0) {
|
if (buf_size && buf_size % ((G729_8K_BLOCK_SIZE + (avctx->codec_id == AV_CODEC_ID_ACELP_KELVIN)) * avctx->channels) == 0) {
|
||||||
packet_type = FORMAT_G729_8K;
|
packet_type = FORMAT_G729_8K;
|
||||||
format = &format_g729_8k;
|
format = &format_g729_8k;
|
||||||
//Reset voice decision
|
//Reset voice decision
|
||||||
|
|
Loading…
Reference in New Issue