From: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Date: Sun, 13 Apr 2008 08:55:02 +0000 (+0000)
Subject: Do not call update_initial_durations if pkt->duration is 0.
X-Git-Tag: v0.5~5138
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ee794d1e495404a743706123a7257f4f31941045;p=platform%2Fupstream%2Flibav.git

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
---

diff --git a/libavformat/utils.c b/libavformat/utils.c
index d85090c..dad2104 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);
         }
     }