From: Alex Converse <alex.converse@gmail.com>
Date: Sat, 3 Dec 2011 01:00:11 +0000 (-0800)
Subject: mov: Allow empty stts atom.
X-Git-Tag: android-x86-4.4-r1~8529^2~4321
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6d23d19729b2108459d6182b1a0afd0283aea1c6;p=android-x86%2Fexternal-ffmpeg.git

mov: Allow empty stts atom.

Fixes regressions caused by 30c3d976
---

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 9f45441a71..e2bb4d650d 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1500,7 +1500,9 @@ 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))
+    if (!entries)
+        return 0;
+    if (entries >= UINT_MAX / sizeof(*sc->stts_data))
         return AVERROR(EINVAL);
 
     sc->stts_data = av_malloc(entries * sizeof(*sc->stts_data));