From: Ronald S. Bultje <rsbultje@gmail.com>
Date: Tue, 17 May 2011 14:26:30 +0000 (-0400)
Subject: h264: copy pixel_shift between slice threading contexts.
X-Git-Tag: android-x86-4.4-r1~12310^2~1269
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8d44cd2cd82e27e6b051fe0606dece3b0bec0bcd;p=android-x86%2Fexternal-ffmpeg.git

h264: copy pixel_shift between slice threading contexts.

Fixes "make THREADS=2 THREAD_TYPE=2
fate-h264-conformance-frext-pph10i3_panasonic_a".
---

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);
         }