Mercurial > libavformat.hg

changeset 1025:95e8458ae120 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
duration and subitle fix from the patch by Steve Lhomme
author michael
date Wed, 22 Mar 2006 11:11:02 +0000
parents 144729fd2d6c
children 3cf3b7a81b26
files matroska.c
diffstat 1 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/matroska.c	Wed Mar 22 11:06:08 2006 +0000
+++ b/matroska.c	Wed Mar 22 11:11:02 2006 +0000
@@ -305,9 +305,8 @@
     /* timescale in the file */
     int64_t time_scale;
 
-    /* length, position (time, ns) */
-    int64_t duration,
-        pos;
+    /* position (time, ns) */
+    int64_t pos;
 
     /* num_streams is the number of streams that av_new_stream() was called
      * for ( = that are available to the calling program). */
@@ -1094,7 +1093,7 @@
                 double num;
                 if ((res = ebml_read_float(matroska, &id, &num)) < 0)
                     break;
-                matroska->duration = num * matroska->time_scale;
+                matroska->ctx->duration = num * matroska->time_scale * 1000 / AV_TIME_BASE;
                 break;
             }
 
@@ -2245,6 +2244,8 @@
                 st->codec->codec_type = CODEC_TYPE_AUDIO;
                 st->codec->sample_rate = audiotrack->samplerate;
                 st->codec->channels = audiotrack->channels;
+            } else if (track->type == MATROSKA_TRACK_TYPE_SUBTITLE) {
+                st->codec->codec_type = CODEC_TYPE_SUBTITLE;
             }
 
             /* What do we do with private data? E.g. for Vorbis. */