avcodec/h264_parse: Treat escaped and unescaped decoding error equal in decode_extrad...
authorMichael Niedermayer <michael@niedermayer.cc>
Sat, 25 Nov 2017 21:21:16 +0000 (22:21 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 3 Dec 2017 01:23:35 +0000 (02:23 +0100)
Fixes: lorex.mp4
Fixes: ticket6762

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/h264_parse.c

index a7c71d9..fee28d9 100644 (file)
@@ -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;