avcodec/h264_slice: Fix dequant table init with field pictures
authorMichael Niedermayer <michael@niedermayer.cc>
Fri, 12 Feb 2016 02:43:17 +0000 (03:43 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Fri, 12 Feb 2016 03:37:35 +0000 (04:37 +0100)
Fixes regression of Ticket4389

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/h264_slice.c

index 8a33553..2131338 100644 (file)
@@ -1422,7 +1422,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl)
         }
     }
 
-    if (first_slice && h->dequant_coeff_pps != pps_id) {
+    if (!h->current_slice && h->dequant_coeff_pps != pps_id) {
         h->dequant_coeff_pps = pps_id;
         ff_h264_init_dequant_tables(h);
     }