diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-07 03:45:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-13 20:48:08 +0100 |
| commit | 6005f375aab60d620badc2726d1f43dcca9f94cc (patch) | |
| tree | cb9edf5a0b090fc70a85aff73635877e87ad76f6 | |
| parent | 4d5beea7a1820289e211345db06ba185d51772d8 (diff) | |
| download | ffmpeg-6005f375aab60d620badc2726d1f43dcca9f94cc.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 641ec23af4..8b4511ce47 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) |