aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2011-05-17 10:26:30 -0400
committerRonald S. Bultje <rsbultje@gmail.com>2011-05-18 06:54:15 -0400
commit8d44cd2cd82e27e6b051fe0606dece3b0bec0bcd (patch)
treefe4691421f97fe419f63a3158ffd65966c413fd4
parenta64c58a24023b3e8c9b30bfb6908150b57117a3b (diff)
downloadffmpeg-8d44cd2cd82e27e6b051fe0606dece3b0bec0bcd.tar.gz
h264: copy pixel_shift between slice threading contexts.
Fixes "make THREADS=2 THREAD_TYPE=2 fate-h264-conformance-frext-pph10i3_panasonic_a".
-rw-r--r--libavcodec/h264.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 616d0a4804..6b262bc992 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1965,6 +1965,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
c->h264dsp = h->h264dsp;
c->sps = h->sps;
c->pps = h->pps;
+ c->pixel_shift = h->pixel_shift;
init_scan_tables(c);
clone_tables(c, h, i);
}