Commit 2aeeb3ba authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'f89d76c1'

* commit 'f89d76c1':
  mpeg4video: Initialize xvididct for all threads

Conflicts:
	libavcodec/mpeg4videodec.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 66eacd55 f89d76c1
...@@ -2687,6 +2687,7 @@ static int mpeg4_update_thread_context(AVCodecContext *dst, ...@@ -2687,6 +2687,7 @@ static int mpeg4_update_thread_context(AVCodecContext *dst,
{ {
Mpeg4DecContext *s = dst->priv_data; Mpeg4DecContext *s = dst->priv_data;
const Mpeg4DecContext *s1 = src->priv_data; const Mpeg4DecContext *s1 = src->priv_data;
int init = s->m.context_initialized;
int ret = ff_mpeg_update_thread_context(dst, src); int ret = ff_mpeg_update_thread_context(dst, src);
...@@ -2695,6 +2696,9 @@ static int mpeg4_update_thread_context(AVCodecContext *dst, ...@@ -2695,6 +2696,9 @@ static int mpeg4_update_thread_context(AVCodecContext *dst,
memcpy(((uint8_t*)s) + sizeof(MpegEncContext), ((uint8_t*)s1) + sizeof(MpegEncContext), sizeof(Mpeg4DecContext) - sizeof(MpegEncContext)); memcpy(((uint8_t*)s) + sizeof(MpegEncContext), ((uint8_t*)s1) + sizeof(MpegEncContext), sizeof(Mpeg4DecContext) - sizeof(MpegEncContext));
if (CONFIG_MPEG4_DECODER && !init && s1->xvid_build >= 0)
ff_xvididct_init(&s->m.idsp, dst);
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment