ffmpeg | branch: release/2.5 | Michael Niedermayer <michae...@gmx.at> | Sat Feb 7 03:45:14 2015 +0100| [0cbf53bdf51623f42938ffaddb5c3fd06295995e] | committer: Michael Niedermayer
avcodec/h264_slice: assert that reinit does not occur after the first slice Signed-off-by: Michael Niedermayer <michae...@gmx.at> (cherry picked from commit 2fd9ce92af43e6dcbc8ed7c26c00b052de48ccad) Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0cbf53bdf51623f42938ffaddb5c3fd06295995e --- libavcodec/h264_slice.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index aedfa3e..f03ab4e 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) _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
