diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2008-04-13 08:55:02 +0000 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2008-04-13 08:55:02 +0000 |
| commit | ee794d1e495404a743706123a7257f4f31941045 (patch) | |
| tree | a49bedd5714746a0978a5c23fc572543ef43c237 | |
| parent | ba0dabbf1f55c190a3a4d5b6fb114220182b5e8f (diff) | |
| download | ffmpeg-ee794d1e495404a743706123a7257f4f31941045.tar.gz | |
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
| -rw-r--r-- | libavformat/utils.c | 2 |
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); } } |