[FFmpeg-cvslog] avformat/mov: fix return code for trun box with no sample entries

Gyan Doshi git at videolan.org
Mon Jul 22 20:18:01 EEST 2019


ffmpeg | branch: master | Gyan Doshi <ffmpeg at gyani.pro> | Sun Jul 21 00:02:14 2019 +0530| [d51d71c1e3a6a225a5bc8f35963b50331e479b1a] | committer: Gyan Doshi

avformat/mov: fix return code for trun box with no sample entries

A value of zero for sample_count in trun box is not
prohibited by 14496-12 section 8.8.8. 4a9d32baca
disallowed this which led the demuxer to error out
when reading the header of valid files.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d51d71c1e3a6a225a5bc8f35963b50331e479b1a
---

 libavformat/mov.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 327a25bbdf..24de5429d1 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -4781,8 +4781,8 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom)
         entries = UINT_MAX / sizeof(AVIndexEntry) - st->nb_index_entries;
         av_log(c->fc, AV_LOG_ERROR, "Failed to add index entry\n");
     }
-    if (entries <= 0)
-        return -1;
+    if (entries == 0)
+        return 0;
 
     requested_size = (st->nb_index_entries + entries) * sizeof(AVIndexEntry);
     new_entries = av_fast_realloc(st->index_entries,



More information about the ffmpeg-cvslog mailing list