xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-29 14:30:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

scale duration and default_duration

Browse Source 
Originally committed as revision 8363 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2007-03-13 00:01:24 +00:00
parent 20bd4e0799
commit 25f2b76fdb
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavformat/matroska.c
View File

@ -254,7 +254,7 @@ typedef struct Track {
unsigned char *codec_priv;
int codec_priv_size;
int64_t default_duration;
uint64_t default_duration;
MatroskaTrackFlags flags;
} MatroskaTrack;
@ -1307,7 +1307,7 @@ matroska_add_stream (MatroskaDemuxContext *matroska)
if ((res = ebml_read_uint (matroska, &id,
&num)) < 0)
break;
track->default_duration = num;
track->default_duration = num/matroska->time_scale;
break;
}
@ -1317,7 +1317,7 @@ matroska_add_stream (MatroskaDemuxContext *matroska)
if ((res = ebml_read_float(matroska, &id,
&num)) < 0)
break;
track->default_duration = 1000000000 * (1. / num);
track->default_duration = 1000000000/(matroska->time_scale*num);
break;
}
@ -1620,7 +1620,7 @@ matroska_add_stream (MatroskaDemuxContext *matroska)
uint64_t num;
if ((res = ebml_read_uint(matroska, &id, &num)) < 0)
break;
track->default_duration = num;
track->default_duration = num / matroska->time_scale;
break;
}
@ -2357,7 +2357,7 @@ matroska_read_header (AVFormatContext *s,
if (track->default_duration)
av_reduce(&st->codec->time_base.num, &st->codec->time_base.den,
track->default_duration, 1000000000, 30000);
track->default_duration, 1000, 30000);
if(extradata){
st->codec->extradata = extradata;
@ -2646,6 +2646,7 @@ matroska_parse_blockgroup (MatroskaDemuxContext *matroska,
case MATROSKA_ID_BLOCKDURATION: {
if ((res = ebml_read_uint(matroska, &id, &duration)) < 0)
break;
duration /= matroska->time_scale;
break;
}
@ -2691,7 +2692,7 @@ matroska_parse_blockgroup (MatroskaDemuxContext *matroska,
if (duration != AV_NOPTS_VALUE)
pkt->duration = duration;
else if (track >= 0 && track < matroska->num_tracks)
pkt->duration = matroska->tracks[track]->default_duration / matroska->time_scale;
pkt->duration = matroska->tracks[track]->default_duration;
}
return res;