From a0174f67298ba9494c146183dd360e637b03db64 Mon Sep 17 00:00:00 2001 From: Ivan Date: Mon, 25 Jan 2016 14:43:40 +0200 Subject: avformat/flvenc: copyts in FLV muxer The purpose of this patch is to preserve timestamps when using ffmpeg for publishing RTMP streams, e.g. ffmpeg -i rtmp://source/stream -f flv rtmp://target/stream. There is a setting "copyts" for that purpose. Unfortunately it doesn't work with FLV muxer because it has its own timestamp correction which makes global setting "copyts" ineffective. This patch removes timestamp correction in FLV muxer. This means FLV will rely on ffmpeg timestamp correction which makes it possible to use copyts. Signed-off-by: Michael Niedermayer --- libavformat/flvenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavformat/flvenc.c') diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 3925768fef..8fd5d29431 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -562,7 +562,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) return AVERROR(EINVAL); } - ts = pkt->dts + flv->delay; // add delay to force positive dts + ts = pkt->dts; if (s->event_flags & AVSTREAM_EVENT_FLAG_METADATA_UPDATED) { write_metadata(s, ts); -- cgit v1.2.3