From 7a5c850be9b2716e1cf0edb187f1b2d0f48585b8 Mon Sep 17 00:00:00 2001 From: Alexander Strange Date: Wed, 31 Mar 2010 03:55:42 +0000 Subject: [PATCH] H264: Copy h264dsp when creating new slice threads Fixes slice multithreading (broken in r22565) Fixes issue1815 Originally committed as revision 22740 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/h264.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 62c74a3325..9943ab956f 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1843,6 +1843,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ c = h->thread_context[i] = av_malloc(sizeof(H264Context)); memcpy(c, h->s.thread_context[i], sizeof(MpegEncContext)); memset(&c->s + 1, 0, sizeof(H264Context) - sizeof(MpegEncContext)); + c->h264dsp = h->h264dsp; c->sps = h->sps; c->pps = h->pps; init_scan_tables(c);