mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-24 08:12:44 +00:00
avcodec/h264_parse: Treat escaped and unescaped decoding error equal in decode_extradata_ps_mp4()
Fixes: lorex.mp4 Fixes: ticket6762 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
225341b20d
commit
4bb7d72bcf
@ -425,10 +425,9 @@ static int decode_extradata_ps_mp4(const uint8_t *buf, int buf_size, H264ParamSe
|
|||||||
escaped_buf_size = bytestream2_tell_p(&pbc);
|
escaped_buf_size = bytestream2_tell_p(&pbc);
|
||||||
AV_WB16(escaped_buf, escaped_buf_size - 2);
|
AV_WB16(escaped_buf, escaped_buf_size - 2);
|
||||||
|
|
||||||
ret = decode_extradata_ps(escaped_buf, escaped_buf_size, ps, 1, logctx);
|
(void)decode_extradata_ps(escaped_buf, escaped_buf_size, ps, 1, logctx);
|
||||||
|
// lorex.mp4 decodes ok even with extradata decoding failing
|
||||||
av_freep(&escaped_buf);
|
av_freep(&escaped_buf);
|
||||||
if (ret < 0)
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user