diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-11-28 10:54:35 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2014-01-18 20:53:31 +0100 |
| commit | 8b2e5e42bb9d6a59ede5af2e6df4aaf7750d1195 (patch) | |
| tree | 81c10174c84512bd5b151a40d874e16c3d12721c | |
| parent | 9ecabd7892ff073ae60ded3fc0a1290f5914ed5c (diff) | |
| download | ffmpeg-8b2e5e42bb9d6a59ede5af2e6df4aaf7750d1195.tar.gz | |
h264: check that an IDR NAL only contains I slices
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
| -rw-r--r-- | libavcodec/h264.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 6f329aacb3..4b10a68f03 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3383,6 +3383,12 @@ static int decode_slice_header(H264Context *h, H264Context *h0) h->slice_type = slice_type; h->slice_type_nos = slice_type & 3; + if (h->nal_unit_type == NAL_IDR_SLICE && + h->slice_type_nos != AV_PICTURE_TYPE_I) { + av_log(h->avctx, AV_LOG_ERROR, "A non-intra slice in an IDR NAL unit.\n"); + return AVERROR_INVALIDDATA; + } + // to make a few old functions happy, it's wrong though h->pict_type = h->slice_type; |