Mercurial > libavformat.hg
changeset 1035:4a33428641e1 libavformat
fixing timebase
| author | michael |
|---|---|
| date | Sat, 25 Mar 2006 19:40:27 +0000 |
| parents | 2a4d172f52df |
| children | e0b7705c2e42 |
| files | matroska.c |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/matroska.c Sat Mar 25 13:37:34 2006 +0000 +++ b/matroska.c Sat Mar 25 19:40:27 2006 +0000 @@ -2206,7 +2206,7 @@ st = av_new_stream(s, track->stream_index); if (st == NULL) return AVERROR_NOMEM; - av_set_pts_info(st, 24, 1, 1000); /* 24 bit pts in ms */ + av_set_pts_info(st, 64, matroska->time_scale, 1000*1000*1000); /* 64 bit pts in ns */ st->codec->codec_id = codec_id; @@ -2295,7 +2295,7 @@ case MATROSKA_ID_BLOCK: { uint8_t *data, *origdata; int size; - uint64_t block_time; + int16_t block_time; uint32_t *lace_size = NULL; int n, track, flags, laces = 0; uint64_t num; @@ -2329,7 +2329,7 @@ } /* block_time (relative to cluster time) */ - block_time = ((data[0] << 8) | data[1]) * matroska->time_scale; + block_time = (data[0] << 8) | data[1]; data += 2; size -= 2; flags = *data; @@ -2440,7 +2440,7 @@ pkt->stream_index = matroska->tracks[track]->stream_index; - pkt->pts = timecode / 1000000; /* ns to ms */ + pkt->pts = timecode; pkt->pos= pos; matroska_queue_packet(matroska, pkt); @@ -2514,7 +2514,7 @@ uint64_t num; if ((res = ebml_read_uint(matroska, &id, &num)) < 0) break; - cluster_time = num * matroska->time_scale; + cluster_time = num; break; }