projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ba0dabb
)
Do not call update_initial_durations if pkt->duration is 0.
author
Reimar Döffinger
<Reimar.Doeffinger@gmx.de>
Sun, 13 Apr 2008 08:55:02 +0000
(08:55 +0000)
committer
Reimar Döffinger
<Reimar.Doeffinger@gmx.de>
Sun, 13 Apr 2008 08:55:02 +0000
(08:55 +0000)
Fixes and assertion crash when playing amv files, e.g.
http://samples.mplayerhq.hu/amv/Shakira - Hips Don't Lie.amv
Originally committed as revision 12797 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavformat/utils.c
patch
|
blob
|
history
diff --git
a/libavformat/utils.c
b/libavformat/utils.c
index
d85090c
..
dad2104
100644
(file)
--- a/
libavformat/utils.c
+++ b/
libavformat/utils.c
@@
-668,7
+668,7
@@
static void compute_pkt_fields(AVFormatContext *s, AVStream *st,
if (den && num) {
pkt->duration = av_rescale(1, num * (int64_t)st->time_base.den, den * (int64_t)st->time_base.num);
- if(st->cur_dts == 0)
+ if(st->cur_dts == 0
&& pkt->duration != 0
)
update_initial_durations(s, st, pkt);
}
}