ffmpeg | branch: master | Hendrik Leppkes <[email protected]> | Thu Jul 7 20:18:26 2016 +0200| [c3e9b098e12b8932693361625d4a69bc30583d9a] | committer: Hendrik Leppkes
h2645_parse: only read avc length code at the correct position Reading it from any other position would result in a wrong size being read, instead fallback to the re-sync mechanic in the else clause. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c3e9b098e12b8932693361625d4a69bc30583d9a --- libavcodec/h2645_parse.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/h2645_parse.c b/libavcodec/h2645_parse.c index 9979b63..26f2e85 100644 --- a/libavcodec/h2645_parse.c +++ b/libavcodec/h2645_parse.c @@ -258,7 +258,7 @@ int ff_h2645_packet_split(H2645Packet *pkt, const uint8_t *buf, int length, int extract_length = 0; int skip_trailing_zeros = 1; - if (buf >= next_avc) { + if (buf == next_avc) { int i; for (i = 0; i < nal_length_size; i++) extract_length = (extract_length << 8) | buf[i]; @@ -271,6 +271,9 @@ int ff_h2645_packet_split(H2645Packet *pkt, const uint8_t *buf, int length, } next_avc = buf + extract_length; } else { + if (buf > next_avc) + av_log(logctx, AV_LOG_WARNING, "Exceeded next NALFF position, re-syncing.\n"); + /* search start code */ while (buf[0] != 0 || buf[1] != 0 || buf[2] != 1) { ++buf; _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
