[FFmpeg-cvslog] avcodec/h264_slice: assert relation between current_slice ans slice_ctx

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


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Fri Feb 12 03:40:19 2016 +0100| [873158fd76f387142f5a5e6835052f4fd0ec6911] | committer: Michael Niedermayer

avcodec/h264_slice: assert relation between current_slice ans slice_ctx

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

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

 libavcodec/h264_slice.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 6a80d89..8a33553 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -1212,6 +1212,9 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl)
         }
     }
 
+    if (!h->current_slice)
+        av_assert0(sl == h->slice_ctx);
+
     slice_type = get_ue_golomb_31(&sl->gb);
     if (slice_type > 9) {
         av_log(h->avctx, AV_LOG_ERROR,



More information about the ffmpeg-cvslog mailing list