summaryrefslogtreecommitdiffstats
path: root/libmpdemux/muxer_lavf.c
diff options
context:
space:
mode:
authormichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-05-01 11:13:14 +0000
committermichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-05-01 11:13:14 +0000
commitb7b46136ce08b7c12f6753ef53bdbf6ceb4eb05c (patch)
treeffdb21b16d26ddc35253a93e9d01f2b89f09a7e9 /libmpdemux/muxer_lavf.c
parent9e5531f861ead12be512a70ee5c2ec04461d932b (diff)
downloadmpv-b7b46136ce08b7c12f6753ef53bdbf6ceb4eb05c.tar.bz2
mpv-b7b46136ce08b7c12f6753ef53bdbf6ceb4eb05c.tar.xz
fix timestamps
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15315 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/muxer_lavf.c')
-rw-r--r--libmpdemux/muxer_lavf.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libmpdemux/muxer_lavf.c b/libmpdemux/muxer_lavf.c
index b55ae07124..5ffa1e3020 100644
--- a/libmpdemux/muxer_lavf.c
+++ b/libmpdemux/muxer_lavf.c
@@ -213,7 +213,12 @@ static void write_chunk(muxer_stream_t *stream, size_t len, unsigned int flags)
//pkt.pts = AV_NOPTS_VALUE;
+#if LIBAVFORMAT_BUILD >= 4624
+ pkt.pts = (stream->timer / av_q2d(priv->oc->streams[pkt.stream_index]->time_base) + 0.5);
+#else
pkt.pts = AV_TIME_BASE * stream->timer;
+#endif
+//fprintf(stderr, "%Ld %Ld id:%d tb:%f %f\n", pkt.dts, pkt.pts, pkt.stream_index, av_q2d(priv->oc->streams[pkt.stream_index]->time_base), stream->timer);
if(av_interleaved_write_frame(priv->oc, &pkt) != 0) //av_write_frame(priv->oc, &pkt)
{