[FFmpeg-cvslog] avcodec/h264_slice: Fix dequant table init with field pictures

Michael Niedermayer git at videolan.org
Fri Feb 12 04:42:31 CET 2016


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Fri Feb 12 03:43:17 2016 +0100| [69738466189a0f68b0a635b4804ef9cf7bee3672] | committer: Michael Niedermayer

avcodec/h264_slice: Fix dequant table init with field pictures

Fixes regression of Ticket4389

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=69738466189a0f68b0a635b4804ef9cf7bee3672
---

 libavcodec/h264_slice.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 8a33553..2131338 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -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);
     }



More information about the ffmpeg-cvslog mailing list