On Sat, Sep 21, 2013 at 11:55 PM, Martin Storsjö <[email protected]> wrote: > Previously, s->context_initialized was left set to 1 > if ff_vc1_decode_init_alloc_tables failed, skipping the > initialization completely on the next decode call. > > Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind > CC: [email protected] > --- > libavcodec/vc1dec.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-)
I think you mean Undo mpegvideo initialization if _unable_ to allocate tables in the commit message. Vittorio On Sat, Sep 21, 2013 at 11:55 PM, Martin Storsjö <[email protected]> wrote: > Previously, s->context_initialized was left set to 1 > if ff_vc1_decode_init_alloc_tables failed, skipping the > initialization completely on the next decode call. > > Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind > CC: [email protected] > --- > libavcodec/vc1dec.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c > index 35a0fe7..d0566a3 100644 > --- a/libavcodec/vc1dec.c > +++ b/libavcodec/vc1dec.c > @@ -5877,8 +5877,12 @@ static int vc1_decode_frame(AVCodecContext *avctx, > void *data, > } > > if (!s->context_initialized) { > - if (ff_msmpeg4_decode_init(avctx) < 0 || > ff_vc1_decode_init_alloc_tables(v) < 0) > + if (ff_msmpeg4_decode_init(avctx) < 0) > goto err; > + if (ff_vc1_decode_init_alloc_tables(v) < 0) { > + ff_MPV_common_end(s); > + goto err; > + } > > s->low_delay = !avctx->has_b_frames || v->res_sprite; > > -- > 1.7.9.5 > > _______________________________________________ > libav-devel mailing list > [email protected] > https://lists.libav.org/mailman/listinfo/libav-devel _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
