virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

avcodec/ralf: Move frame allocation after error checks

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2022-09-07 01:55:23 +02:00
parent df215e5758
commit dcbb7e8a30
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/ralf.c
View File

@ -451,12 +451,6 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame,
src_size = avpkt->size; src_size = avpkt->size;
} }
frame->nb_samples = ctx->max_frame_size;
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
return ret;
samples0 = (int16_t *)frame->data[0];
samples1 = (int16_t *)frame->data[1];
if (src_size < 5) { if (src_size < 5) {
av_log(avctx, AV_LOG_ERROR, "too short packets are too short!\n"); av_log(avctx, AV_LOG_ERROR, "too short packets are too short!\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
@ -481,6 +475,11 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame,
ctx->num_blocks++; ctx->num_blocks++;
} }
frame->nb_samples = ctx->max_frame_size;
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
return ret;
samples0 = (int16_t *)frame->data[0];
samples1 = (int16_t *)frame->data[1];
block_pointer = src + table_bytes + 2; block_pointer = src + table_bytes + 2;
bytes_left = src_size - table_bytes - 2; bytes_left = src_size - table_bytes - 2;
ctx->sample_offset = 0; ctx->sample_offset = 0;