diff options
| author | Dale Curtis <dalecurtis@chromium.org> | 2025-01-07 00:11:49 +0000 |
|---|---|---|
| committer | Marth64 <marth64@proxyid.net> | 2025-02-02 21:38:19 -0600 |
| commit | 957eb2323a924aa0b148927889eae581185c367b (patch) | |
| tree | 701bb73e934f731255844b92f0252f55ad4d0000 | |
| parent | 33daef5f498c7c6092dd1440481fa898f7c83cf4 (diff) | |
| download | ffmpeg-957eb2323a924aa0b148927889eae581185c367b.tar.gz | |
avcodec/h264dec: make slice header parse errors fatal under AV_EF_EXPLODE
This fixes timeout issues and seems like it was intended
since the line emits an error log.
Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Marth64 <marth64@proxyid.net>
| -rw-r--r-- | libavcodec/h264dec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 8feb5558aa..45ebe2656d 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -742,8 +742,10 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size) nal->type, nal->size_bits); } - if (err < 0) { + if (err < 0 && (h->avctx->err_recognition & AV_EF_EXPLODE)) { av_log(h->avctx, AV_LOG_ERROR, "decode_slice_header error\n"); + ret = err; + goto end; } } |