aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2013-02-11 20:27:50 +0200
committerMartin Storsjö <martin@martin.st>2013-02-11 21:12:21 +0200
commit4c51fe48ba6dde059360b7451db7f6bbf2f11db3 (patch)
treece8a82f237b8fc0df4319a507f4b9488a2c933c9 /libavcodec
parentd192ac3e03d1ebdb671f22b290da577d19f3e156 (diff)
downloadffmpeg-4c51fe48ba6dde059360b7451db7f6bbf2f11db3.tar.gz
h264: Copy h264chroma dsp context to slice thread copies
This fixes slice threading which seems to have been broken since 79dad2a93. Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/h264.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 464c40338c..542070be93 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2569,6 +2569,7 @@ static int h264_slice_header_init(H264Context *h, int reinit)
memset(&c->s + 1, 0, sizeof(H264Context) - sizeof(MpegEncContext));
c->h264dsp = h->h264dsp;
c->h264qpel = h->h264qpel;
+ c->h264chroma = h->h264chroma;
c->sps = h->sps;
c->pps = h->pps;
c->pixel_shift = h->pixel_shift;