[FFmpeg-cvslog] Revert "mov: do not misreport empty stts"

Carl Eugen Hoyos git at videolan.org
Sun Oct 23 01:00:54 CEST 2011


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sun Oct 23 00:54:56 2011 +0200| [9e8dff90efa3faae5ac07fa5fae7e154367e24fd] | committer: Carl Eugen Hoyos

Revert "mov: do not misreport empty stts"

Fixes ticket #578.

This reverts commit 30c3d976f12665d5d13971172aab062a97cb1bce.

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

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

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 198f3cd..f1ceb56 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1563,8 +1563,8 @@ static int mov_read_stts(MOVContext *c, AVIOContext *pb, MOVAtom atom)
     av_dlog(c->fc, "track[%i].stts.entries = %i\n",
             c->fc->nb_streams-1, entries);
 
-    if (!entries || entries >= UINT_MAX / sizeof(*sc->stts_data))
-        return AVERROR(EINVAL);
+    if (entries >= UINT_MAX / sizeof(*sc->stts_data))
+        return -1;
 
     sc->stts_data = av_malloc(entries * sizeof(*sc->stts_data));
     if (!sc->stts_data)



More information about the ffmpeg-cvslog mailing list