[FFmpeg-cvslog] avcodec/h264_slice: assert that reinit does not occur after the first slice

Michael Niedermayer git at videolan.org
Fri Feb 13 20:59:56 CET 2015


ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sat Feb  7 03:45:14 2015 +0100| [6005f375aab60d620badc2726d1f43dcca9f94cc] | committer: Michael Niedermayer

avcodec/h264_slice: assert that reinit does not occur after the first slice

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 2fd9ce92af43e6dcbc8ed7c26c00b052de48ccad)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

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

diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 641ec23..8b4511c 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -1480,6 +1480,8 @@ int ff_h264_decode_slice_header(H264Context *h, H264Context *h0)
             return AVERROR_INVALIDDATA;
         }
 
+        av_assert1(first_slice);
+
         ff_h264_flush_change(h);
 
         if ((ret = get_pixel_format(h, 1)) < 0)



More information about the ffmpeg-cvslog mailing list