diff options
| author | Alexander Strange <astrange@ithinksw.com> | 2010-03-31 03:55:42 +0000 |
|---|---|---|
| committer | Alexander Strange <astrange@ithinksw.com> | 2010-03-31 03:55:42 +0000 |
| commit | 7a5c850be9b2716e1cf0edb187f1b2d0f48585b8 (patch) | |
| tree | 77bbc00f891042b70584fabe86f7eeeb6bb9ac2b /libavcodec | |
| parent | 49553ec8657a9ff6935ee95fb166c73331fd8db5 (diff) | |
| download | ffmpeg-7a5c850be9b2716e1cf0edb187f1b2d0f48585b8.tar.gz | |
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
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.c | 1 |
1 files changed, 1 insertions, 0 deletions
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); |