Commit 4eabecdd authored by astrange's avatar astrange

H264: Copy h264dsp when creating new slice threads

Fixes slice multithreading (broken in r22565)
Fixes issue1815


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@22740 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent b343ca1a
...@@ -1843,6 +1843,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ ...@@ -1843,6 +1843,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
c = h->thread_context[i] = av_malloc(sizeof(H264Context)); c = h->thread_context[i] = av_malloc(sizeof(H264Context));
memcpy(c, h->s.thread_context[i], sizeof(MpegEncContext)); memcpy(c, h->s.thread_context[i], sizeof(MpegEncContext));
memset(&c->s + 1, 0, sizeof(H264Context) - sizeof(MpegEncContext)); memset(&c->s + 1, 0, sizeof(H264Context) - sizeof(MpegEncContext));
c->h264dsp = h->h264dsp;
c->sps = h->sps; c->sps = h->sps;
c->pps = h->pps; c->pps = h->pps;
init_scan_tables(c); init_scan_tables(c);
......
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