On 2014-08-03 09:02:03 -0700, Diego Biurrun wrote: > From: Anton Khirnov <[email protected]> > > Signed-off-by: Diego Biurrun <[email protected]> > --- > > This fixes fate-xvid-idctmmx with more than one thread. > > libavcodec/mpeg4videodec.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c > index 25334ac..c17e385 100644 > --- a/libavcodec/mpeg4videodec.c > +++ b/libavcodec/mpeg4videodec.c > @@ -2539,14 +2539,19 @@ static int mpeg4_update_thread_context(AVCodecContext > *dst, > { > Mpeg4DecContext *s = dst->priv_data; > const Mpeg4DecContext *s1 = src->priv_data; > + int init = s->m.context_initialized; > > int ret = ff_mpeg_update_thread_context(dst, src); > > if (ret < 0) > return ret; > > + if (CONFIG_MPEG4_DECODER && !init && s1->xvid_build >= 0)
the CONFIG_MPEG4_DECODER is kind of superflous since mpeg4_update_thread_context is only used from the mpeg4 decoder. might make sense to keep it though. > + ff_xvididct_init(&s->m.idsp, dst); > + > s->shape = s1->shape; > s->time_increment_bits = s1->time_increment_bits; > + s->xvid_build = s1->xvid_build; > > return 0; > } ok Janne _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
