diff options
author | Mark Thompson <mrt@jkqxz.net> | 2016-03-17 13:41:02 +0000 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-03-19 12:25:24 +0100 |
commit | fbec157ea08f61063847bbe0dba28525e6283ff5 (patch) | |
tree | 0fd72c659860ae98d72ec52420f2a3249e38b602 | |
parent | c411e90bc3f191c75cb9e249e6ae27fd28894d2c (diff) |
lavc/hevc: Allow arbitrary garbage in bytestream as long as at least one NAL unit is found.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r-- | libavcodec/hevc_parse.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libavcodec/hevc_parse.c b/libavcodec/hevc_parse.c index 63ed84a8de..d557cc7f04 100644 --- a/libavcodec/hevc_parse.c +++ b/libavcodec/hevc_parse.c @@ -232,8 +232,14 @@ int ff_hevc_split_packet(HEVCContext *s, HEVCPacket *pkt, const uint8_t *buf, in ++buf; --length; if (length < 4) { - av_log(avctx, AV_LOG_ERROR, "No start code is found.\n"); - return AVERROR_INVALIDDATA; + if (pkt->nb_nals > 0) { + // No more start codes: we discarded some irrelevant + // bytes at the end of the packet. + return 0; + } else { + av_log(avctx, AV_LOG_ERROR, "No start code is found.\n"); + return AVERROR_INVALIDDATA; + } } } |