RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/vp6: Avoid allocation for alpha_context 

Reviewed-by: Peter Ross <pross@xvid.org>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2022-02-11 08:27:40 +01:00
parent 55379dac53
commit 3cbef22f8f
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/vp6.c
View File

@ -652,10 +652,8 @@ static av_cold int vp6_decode_init(AVCodecContext *avctx)
vp6_decode_init_context(s);
if (s->has_alpha) {
s->alpha_context = av_mallocz(sizeof(VP56Context));
if (!s->alpha_context) {
return AVERROR(ENOMEM);
}
/* Can only happen for ff_vp6a_decoder */
s->alpha_context = &s[1];
ret = ff_vp56_init_context(avctx, s->alpha_context,
s->flip == -1, s->has_alpha);
if (ret < 0)
@ -691,7 +689,7 @@ static av_cold int vp6_decode_free(AVCodecContext *avctx)
if (s->alpha_context) {
ff_vp56_free_context(s->alpha_context);
vp6_decode_free_context(s->alpha_context);
av_freep(&s->alpha_context);
s->alpha_context = NULL;
}
return 0;
@ -743,7 +741,7 @@ const AVCodec ff_vp6a_decoder = {
.long_name = NULL_IF_CONFIG_SMALL("On2 VP6 (Flash version, with alpha channel)"),
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_VP6A,
.priv_data_size = sizeof(VP56Context),
.priv_data_size = 2 /* Main context + alpha context */ * sizeof(VP56Context),
.init = vp6_decode_init,
.close = vp6_decode_free,
.decode = ff_vp56_decode_frame,