OSDN Git Service

h264: copy pixel_shift between slice threading contexts.
authorRonald S. Bultje <rsbultje@gmail.com>
Tue, 17 May 2011 14:26:30 +0000 (10:26 -0400)
committerRonald S. Bultje <rsbultje@gmail.com>
Wed, 18 May 2011 10:54:15 +0000 (06:54 -0400)
Fixes "make THREADS=2 THREAD_TYPE=2
fate-h264-conformance-frext-pph10i3_panasonic_a".

libavcodec/h264.c

index 616d0a4..6b262bc 100644 (file)
@@ -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);
         }