highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

duration and subitle fix from the patch by Steve Lhomme

Browse Source 
Originally committed as revision 5196 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Steve L'Homme
2006-03-22 11:11:02 +00:00
committed by Michael Niedermayer
parent 70596d04a8
commit d439facb3d
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/matroska.c
View File

@@ -305,9 +305,8 @@ typedef struct MatroskaDemuxContext {
/* timescale in the file */ /* timescale in the file */
int64_t time_scale; int64_t time_scale;
/* length, position (time, ns) */ /* position (time, ns) */
int64_t duration, int64_t pos;
pos;
/* num_streams is the number of streams that av_new_stream() was called /* num_streams is the number of streams that av_new_stream() was called
* for ( = that are available to the calling program). */ * for ( = that are available to the calling program). */
@@ -1094,7 +1093,7 @@ matroska_parse_info (MatroskaDemuxContext *matroska)
double num; double num;
if ((res = ebml_read_float(matroska, &id, &num)) < 0) if ((res = ebml_read_float(matroska, &id, &num)) < 0)
break; break;
matroska->duration = num * matroska->time_scale; matroska->ctx->duration = num * matroska->time_scale * 1000 / AV_TIME_BASE;
break; break;
} }
@@ -2245,6 +2244,8 @@ matroska_read_header (AVFormatContext *s,
st->codec->codec_type = CODEC_TYPE_AUDIO; st->codec->codec_type = CODEC_TYPE_AUDIO;
st->codec->sample_rate = audiotrack->samplerate; st->codec->sample_rate = audiotrack->samplerate;
st->codec->channels = audiotrack->channels; 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. */ /* What do we do with private data? E.g. for Vorbis. */