MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec: fix clobbered ff_get_buffer()

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2015-02-10 14:20:32 +00:00
parent 9b22e460ad
commit 392d975efe
4 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/atrac3plusdec.c
View File

@ -333,10 +333,8 @@ static int atrac3p_decode_frame(AVCodecContext *avctx, void *data,
float **samples_p = (float **)frame->extended_data;
frame->nb_samples = ATRAC3P_FRAME_SAMPLES;
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
return ret;
}
if ((ret = init_get_bits8(&ctx->gb, avpkt->data, avpkt->size)) < 0)
return ret;

4
libavcodec/fic.c
View File

@ -266,10 +266,8 @@ static int fic_decode_frame(AVCodecContext *avctx, void *data,
int skip_cursor = 0;
uint8_t *sdata;
if ((ret = ff_reget_buffer(avctx, ctx->frame)) < 0) {
av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
if ((ret = ff_reget_buffer(avctx, ctx->frame)) < 0)
return ret;
}
/* Header + at least one slice (4) */
if (avpkt->size < FIC_HEADER_SIZE + 4) {

8
libavcodec/on2avc.c
View File

@ -848,10 +848,8 @@ static int on2avc_decode_frame(AVCodecContext * avctx, void *data,
if (c->is_av500) {
/* get output buffer */
frame->nb_samples = ON2AVC_SUBFRAME_SIZE;
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
return ret;
}
if ((ret = on2avc_decode_subframe(c, buf, buf_size, frame, 0)) < 0)
return ret;
@ -874,10 +872,8 @@ static int on2avc_decode_frame(AVCodecContext * avctx, void *data,
/* get output buffer */
frame->nb_samples = ON2AVC_SUBFRAME_SIZE * num_frames;
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
return ret;
}
audio_off = 0;
bytestream2_init(&gb, buf, buf_size);

4
libavcodec/opusdec.c
View File

@ -474,10 +474,8 @@ static int opus_decode_packet(AVCodecContext *avctx, void *data,
/* setup the data buffers */
ret = ff_get_buffer(avctx, frame, 0);
if (ret < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
if (ret < 0)
return ret;
}
frame->nb_samples = 0;
for (i = 0; i < avctx->channels; i++) {