summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2008-04-13 08:55:02 +0000
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2008-04-13 08:55:02 +0000
commitee794d1e495404a743706123a7257f4f31941045 (patch)
treea49bedd5714746a0978a5c23fc572543ef43c237 /libavformat
parentba0dabbf1f55c190a3a4d5b6fb114220182b5e8f (diff)
Do not call update_initial_durations if pkt->duration is 0.
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
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/utils.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index d85090cfca..dad210499e 100644
--- 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);
}
}