Fixes lots of FATE tests, e.g. lavf-nut, as well as the nut part of
ticket #7980.
Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@gmail.com>
---
This patch is made to match the previous behaviour; whether the previous
behaviour is correct at all if the header length is zero is unknown to
me.
libavformat/nutenc.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c
index e9a3bb49db..dc714eb809 100644
--- a/libavformat/nutenc.c
+++ b/libavformat/nutenc.c
@@ -791,8 +791,9 @@ static int get_needed_flags(NUTContext *nut, StreamContext
*nus, FrameCode *fc,
flags |= FLAG_CHECKSUM;
if (pkt->size < nut->header_len[fc->header_idx] ||
(pkt->size > 4096 && fc->header_idx) ||
- memcmp(pkt->data, nut->header[fc->header_idx],
- nut->header_len[fc->header_idx]))
+ (nut->header_len[fc->header_idx] > 0 &&
+ memcmp(pkt->data, nut->header[fc->header_idx],
+ nut->header_len[fc->header_idx])))
flags |= FLAG_HEADER_IDX;
return flags | (fc->flags & FLAG_CODED);
--
2.20.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
