summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2007-08-16 21:54:04 +0000
committerAurelien Jacobs <aurel@gnuage.org>2007-08-16 21:54:04 +0000
commita92d20629c6fc79c8adc80a7fd1a2847dc8c4656 (patch)
tree76aa21e169b0e7b4d26c9658e8e575298f13b95f /libavformat
parent2f4d5971dc445c57820563cce64cc802aa421693 (diff)
calculate default_duration according to framerate only when not already set
Originally committed as revision 10125 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/matroskadec.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index ace9917929..b6a98931ef 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1099,6 +1099,7 @@ matroska_add_stream (MatroskaDemuxContext *matroska)
if ((res = ebml_read_float(matroska, &id,
&num)) < 0)
break;
+ if (!track->default_duration)
track->default_duration = 1000000000/(matroska->time_scale*num);
break;
}