[FFmpeg-cvslog] mpeg4video: Initialize xvididct for all threads
Anton Khirnov
git at videolan.org
Mon Aug 4 04:21:04 CEST 2014
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sun Aug 3 04:59:03 2014 -0700| [f89d76c10355242c39b08f253c1d1524f45ef778] | committer: Diego Biurrun
mpeg4video: Initialize xvididct for all threads
Signed-off-by: Diego Biurrun <diego at biurrun.de>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f89d76c10355242c39b08f253c1d1524f45ef778
---
libavcodec/mpeg4videodec.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index cb88f77..863dd29 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)
+ 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;
}
More information about the ffmpeg-cvslog
mailing list