diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-07 03:45:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-12 17:10:36 +0100 |
| commit | 0cbf53bdf51623f42938ffaddb5c3fd06295995e (patch) | |
| tree | 020751cdf24e99f508f9a96d24dedc06fe0e5555 | |
| parent | b20409c6907c4e446968bb55cef1a2307f2b9683 (diff) | |
| download | ffmpeg-0cbf53bdf51623f42938ffaddb5c3fd06295995e.tar.gz | |
avcodec/h264_slice: assert that reinit does not occur after the first slice
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 2fd9ce92af43e6dcbc8ed7c26c00b052de48ccad)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264_slice.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index aedfa3ec11..f03ab4ebfb 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) |