From fbec157ea08f61063847bbe0dba28525e6283ff5 Mon Sep 17 00:00:00 2001
From: Mark Thompson <mrt@jkqxz.net>
Date: Thu, 17 Mar 2016 13:41:02 +0000
Subject: [PATCH] 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>
---
libavcodec/hevc_parse.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/libavcodec/hevc_parse.c b/libavcodec/hevc_parse.c
index 63ed84a8de7..d557cc7f04c 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;
+ }
}
}
--
GitLab