Hi!
A user provided a real-life caf file ending with junk after the data
chunk, QuickTime reads such files.
Please comment, Carl Eugen
From 67d49072d60b95ffc8838a20cb87b33b5904dc21 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <ceffm...@gmail.com>
Date: Tue, 15 Jan 2019 00:22:50 +0100
Subject: [PATCH] lavf/cafdec: Do not fail hard if the file ends with junk.
QuickTime does not fail if the file contains random data after the data chunk.
---
libavformat/cafdec.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c
index 7652d9e..20956bc 100644
--- a/libavformat/cafdec.c
+++ b/libavformat/cafdec.c
@@ -310,6 +310,8 @@ static int read_header(AVFormatContext *s)
"skipping CAF chunk: %08"PRIX32" (%s), size %"PRId64"\n",
tag, av_fourcc2str(av_bswap32(tag)), size);
case MKBETAG('f','r','e','e'):
+ if (size < 0 && found_data)
+ goto found_data;
if (size < 0)
return AVERROR_INVALIDDATA;
break;
@@ -325,6 +327,7 @@ static int read_header(AVFormatContext *s)
if (!found_data)
return AVERROR_INVALIDDATA;
+found_data:
if (caf->bytes_per_packet > 0 && caf->frames_per_packet > 0) {
if (caf->data_size > 0)
st->nb_frames = (caf->data_size / caf->bytes_per_packet) * caf->frames_per_packet;
--
1.7.10.4
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
