| Message ID | 20220818223535.13078-2-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | d93dccdc9f6fa41dc5ef743bc195c4fc052a34b4 |
| Headers | show |
| Series | [FFmpeg-devel,1/4] avcodec/bethsoftvideo: Pass GetByteContext into set_palette() | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On Fri, Aug 19, 2022 at 12:35:33AM +0200, Michael Niedermayer wrote: > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavcodec/bethsoftvideo.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) will apply [...]
diff --git a/libavcodec/bethsoftvideo.c b/libavcodec/bethsoftvideo.c index 1d0f9198cf..dc7e2f83bb 100644 --- a/libavcodec/bethsoftvideo.c +++ b/libavcodec/bethsoftvideo.c @@ -79,6 +79,11 @@ static int bethsoftvid_decode_frame(AVCodecContext *avctx, AVFrame *rframe, int code, ret; int yoffset; + bytestream2_init(&vid->g, avpkt->data, avpkt->size); + block_type = bytestream2_get_byte(&vid->g); + if (block_type < 1 || block_type > 4) + return AVERROR_INVALIDDATA; + if ((ret = ff_reget_buffer(avctx, vid->frame, 0)) < 0) return ret; wrap_to_next_line = vid->frame->linesize[0] - avctx->width; @@ -92,11 +97,10 @@ static int bethsoftvid_decode_frame(AVCodecContext *avctx, AVFrame *rframe, return ret; } - bytestream2_init(&vid->g, avpkt->data, avpkt->size); dst = vid->frame->data[0]; frame_end = vid->frame->data[0] + vid->frame->linesize[0] * avctx->height; - switch(block_type = bytestream2_get_byte(&vid->g)){ + switch(block_type){ case PALETTE_BLOCK: { *got_frame = 0; if ((ret = set_palette(vid, &vid->g)) < 0) {
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavcodec/bethsoftvideo.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)