diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-11-25 22:21:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-01-28 15:31:13 +0100 |
| commit | d6a13f031ced11ef291768a76c90d76e1b586526 (patch) | |
| tree | d4b57987ea880b85e7017f33bdc133ee1d52e130 /libavcodec/h264_parse.c | |
| parent | 0f0a2ff5a09d0372d9864c070859849654589ad0 (diff) | |
| download | ffmpeg-d6a13f031ced11ef291768a76c90d76e1b586526.tar.gz | |
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>
(cherry picked from commit 4bb7d72bcfb56ae4fe56055927cf53cf484f5df4)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/h264_parse.c')
| -rw-r--r-- | libavcodec/h264_parse.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/h264_parse.c b/libavcodec/h264_parse.c index a7c71d9bbb..fee28d90d9 100644 --- a/libavcodec/h264_parse.c +++ b/libavcodec/h264_parse.c @@ -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); 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); - if (ret < 0) - return ret; } return 0; |