virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-10-30 23:18:11 +02:00
Code Issues Releases Activity

avcodec/smc: Move transient GetByteContext from context to stack

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2022-09-17 12:54:53 +02:00
parent 6a8b3e7eb1
commit 353108bfab
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/smc.c
View File

@@ -46,8 +46,6 @@ typedef struct SmcContext {
AVCodecContext *avctx;
AVFrame *frame;
GetByteContext gb;
/* SMC color tables */
uint8_t color_pairs[COLORS_PER_TABLE * CPAIR];
uint8_t color_quads[COLORS_PER_TABLE * CQUAD];
@@ -75,9 +73,8 @@ typedef struct SmcContext {
} \
}
static int smc_decode_stream(SmcContext *s)
static int smc_decode_stream(SmcContext *s, GetByteContext *gb)
{
GetByteContext *gb = &s->gb;
int width = s->avctx->width;
int height = s->avctx->height;
int stride = s->frame->linesize[0];
@@ -430,20 +427,20 @@ static int smc_decode_frame(AVCodecContext *avctx, AVFrame *rframe,
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
SmcContext *s = avctx->priv_data;
GetByteContext gb;
int ret;
int total_blocks = ((s->avctx->width + 3) / 4) * ((s->avctx->height + 3) / 4);
if (total_blocks / 1024 > avpkt->size)
return AVERROR_INVALIDDATA;
bytestream2_init(&s->gb, buf, buf_size);
if ((ret = ff_reget_buffer(avctx, s->frame, 0)) < 0)
return ret;
s->frame->palette_has_changed = ff_copy_palette(s->pal, avpkt, avctx);
ret = smc_decode_stream(s);
bytestream2_init(&gb, buf, buf_size);
ret = smc_decode_stream(s, &gb);
if (ret < 0)
return ret;