diff options
| author | Luca Abeni <lucabe72@email.it> | 2006-02-01 11:31:33 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-02-01 11:31:33 +0000 |
| commit | 0a7b514f13baddda8641ab365aa2f9c218839c47 (patch) | |
| tree | fbfc6d5fd2691800880de6b3884d617e4679490c /libavformat/audio.c | |
| parent | b5bba45905c074d9c8a9388589fda3f48cb08437 (diff) | |
| download | ffmpeg-0a7b514f13baddda8641ab365aa2f9c218839c47.tar.gz | |
video4linux2 input support
patch by Luca Abeni, lucabe72 $$at$$ email $$dot$$ it
Originally committed as revision 4916 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/audio.c')
| -rw-r--r-- | libavformat/audio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/audio.c b/libavformat/audio.c index 7537f9c6e2..a9e9c7f167 100644 --- a/libavformat/audio.c +++ b/libavformat/audio.c @@ -239,7 +239,7 @@ static int audio_read_header(AVFormatContext *s1, AVFormatParameters *ap) st->codec->sample_rate = s->sample_rate; st->codec->channels = s->channels; - av_set_pts_info(st, 48, 1, 1000000); /* 48 bits pts in us */ + av_set_pts_info(st, 64, 1, 1000000); /* 64 bits pts in us */ return 0; } @@ -271,7 +271,7 @@ static int audio_read_packet(AVFormatContext *s1, AVPacket *pkt) if (ret == -1 && (errno == EAGAIN || errno == EINTR)) { av_free_packet(pkt); pkt->size = 0; - pkt->pts = av_gettime() & ((1LL << 48) - 1); + pkt->pts = av_gettime(); return 0; } if (!(ret == 0 || (ret == -1 && (errno == EAGAIN || errno == EINTR)))) { @@ -291,7 +291,7 @@ static int audio_read_packet(AVFormatContext *s1, AVPacket *pkt) cur_time -= (bdelay * 1000000LL) / (s->sample_rate * s->channels); /* convert to wanted units */ - pkt->pts = cur_time & ((1LL << 48) - 1); + pkt->pts = cur_time; if (s->flip_left && s->channels == 2) { int i; |