Merge commit 'b25cd7540e7cba9868edc13817c0ce1ddef90ffc'

[ffmpeg] / libavcodec / h264.c

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 8eb3b13e12a4b942ee606ce1b9c5855da899d995..f79735bc18a825d051c94edb57cde7f8c1140018 100644 (file)
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -951,7 +951,7 @@ again:
         case NAL_SLICE:
             sl->gb = nal->gb;
 
-            if ((err = ff_h264_decode_slice_header(h, sl)))
+            if ((err = ff_h264_decode_slice_header(h, sl, nal)))
                 break;
 
             if (h->sei.recovery_point.recovery_frame_cnt >= 0) {