OSDN Git Service
(root)
/
coroid
/
libav_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
87e76ae
)
warn if stream timescale is not set and set it to 1 to avoid FPE
author
Baptiste Coudurier
<baptiste.coudurier@gmail.com>
Thu, 5 Nov 2009 07:11:54 +0000
(07:11 +0000)
committer
Baptiste Coudurier
<baptiste.coudurier@gmail.com>
Thu, 5 Nov 2009 07:11:54 +0000
(07:11 +0000)
Originally committed as revision 20456 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavformat/mov.c
patch
|
blob
|
history
diff --git
a/libavformat/mov.c
b/libavformat/mov.c
index
26f516b
..
dfe50c1
100644
(file)
--- a/
libavformat/mov.c
+++ b/
libavformat/mov.c
@@
-1572,8
+1572,12
@@
static int mov_read_trak(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
return 0;
}
- if (!sc->time_scale)
+ if (!sc->time_scale) {
+ av_log(c->fc, AV_LOG_WARNING, "stream %d, timescale not set\n", st->index);
sc->time_scale = c->time_scale;
+ if (!sc->time_scale)
+ sc->time_scale = 1;
+ }
av_set_pts_info(st, 64, 1, sc->time_scale);