aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2011-10-23 00:54:56 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2011-10-23 00:54:56 +0200
commit9e8dff90efa3faae5ac07fa5fae7e154367e24fd (patch)
tree23dd72aee4d65ddd49861fb144ef2314cbc9afda
parente60779b18cefd49443bb237cc9fc68795b3b9dfc (diff)
downloadffmpeg-9e8dff90efa3faae5ac07fa5fae7e154367e24fd.tar.gz
Revert "mov: do not misreport empty stts"
Fixes ticket #578. This reverts commit 30c3d976f12665d5d13971172aab062a97cb1bce.
-rw-r--r--libavformat/mov.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 198f3cd938..f1ceb56e9f 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)