diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-07 23:49:00 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-07 23:49:00 +0400 |
commit | bc773d0d422f6eb541b44d4c021831e804e103f7 (patch) | |
tree | 8969818358a69c400af6c594a9858f18d6a690e5 /libavformat/mpc8.c | |
parent | 0049af262825254705bdbb97c28004dd7c7c2b24 (diff) | |
parent | f5d2c597e99af218b0d4d1cf9737c7e68ee934e4 (diff) |
Merge commit 'f5d2c597e99af218b0d4d1cf9737c7e68ee934e4'
* commit 'f5d2c597e99af218b0d4d1cf9737c7e68ee934e4':
build: fix library installation on cygwin
mpc8: add a flush function
mpc8: set packet duration and stream start time instead of tracking frames
Conflicts:
libavformat/mpc8.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpc8.c')
-rw-r--r-- | libavformat/mpc8.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavformat/mpc8.c b/libavformat/mpc8.c index 0b1f6b6e49..28b64325e7 100644 --- a/libavformat/mpc8.c +++ b/libavformat/mpc8.c @@ -49,7 +49,6 @@ static const int mpc8_rate[8] = { 44100, 48000, 37800, 32000, -1, -1, -1, -1 }; typedef struct { int ver; - int frame; int64_t header_pos; int64_t samples; @@ -240,6 +239,7 @@ static int mpc8_read_header(AVFormatContext *s) st->codec->channels = (st->codec->extradata[1] >> 4) + 1; st->codec->sample_rate = mpc8_rate[st->codec->extradata[0] >> 5]; avpriv_set_pts_info(st, 32, 1152 << (st->codec->extradata[1]&3)*2, st->codec->sample_rate); + st->start_time = 0; st->duration = c->samples / (1152 << (st->codec->extradata[1]&3)*2); size -= avio_tell(pb) - pos; if (size > 0) @@ -274,7 +274,7 @@ static int mpc8_read_packet(AVFormatContext *s, AVPacket *pkt) if(av_get_packet(s->pb, pkt, size) < 0) return AVERROR(ENOMEM); pkt->stream_index = 0; - pkt->pts = c->frame++; + pkt->duration = 1; return 0; } if(tag == TAG_STREAMEND) @@ -287,13 +287,12 @@ static int mpc8_read_packet(AVFormatContext *s, AVPacket *pkt) static int mpc8_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int flags) { AVStream *st = s->streams[stream_index]; - MPCContext *c = s->priv_data; int index = av_index_search_timestamp(st, timestamp, flags); if(index < 0) return -1; if (avio_seek(s->pb, st->index_entries[index].pos, SEEK_SET) < 0) return -1; - c->frame = st->index_entries[index].timestamp; + ff_update_cur_dts(s, st, st->index_entries[index].timestamp); return 0; } |