1
0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-14 11:14:44 +00:00

vc1dec: Properly call deinit function on error

This commit is contained in:
Vittorio Giovara 2016-02-24 14:40:17 -05:00
parent 35b1cd343c
commit f91d94bdfc

View File

@ -362,20 +362,14 @@ av_cold int ff_vc1_decode_init_alloc_tables(VC1Context *v)
if (!v->mv_type_mb_plane || !v->direct_mb_plane || !v->acpred_plane || !v->over_flags_plane || if (!v->mv_type_mb_plane || !v->direct_mb_plane || !v->acpred_plane || !v->over_flags_plane ||
!v->block || !v->cbp_base || !v->ttblk_base || !v->is_intra_base || !v->luma_mv_base || !v->block || !v->cbp_base || !v->ttblk_base || !v->is_intra_base || !v->luma_mv_base ||
!v->mb_type_base) { !v->mb_type_base) {
av_freep(&v->mv_type_mb_plane); goto error;
av_freep(&v->direct_mb_plane);
av_freep(&v->acpred_plane);
av_freep(&v->over_flags_plane);
av_freep(&v->block);
av_freep(&v->cbp_base);
av_freep(&v->ttblk_base);
av_freep(&v->is_intra_base);
av_freep(&v->luma_mv_base);
av_freep(&v->mb_type_base);
return AVERROR(ENOMEM);
} }
return 0; return 0;
error:
ff_vc1_decode_end(s->avctx);
return AVERROR(ENOMEM);
} }
av_cold void ff_vc1_init_transposed_scantables(VC1Context *v) av_cold void ff_vc1_init_transposed_scantables(VC1Context *v)