From abb810db036628e11a5171134ebe320b187ee6d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Thu, 29 May 2014 12:22:26 +0300 Subject: [PATCH] Revert "rtpenc_chain: Don't copy the time_base back to the caller" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit While it strictly isn't necessary to copy the time base (since any use of it is scaled in ff_write_chained), it still is better to signal the actual time base to the caller, avoiding one unnecessary rescaling. This also lets the caller know what the actual internal time base is, in case that is useful info for some caller. This reverts commit 397ffde115f4e0482a007b672f40457596cebfc4. Signed-off-by: Martin Storsjö --- libavformat/rtpenc_chain.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/rtpenc_chain.c b/libavformat/rtpenc_chain.c index 10c4020cfe..38062543a2 100644 --- a/libavformat/rtpenc_chain.c +++ b/libavformat/rtpenc_chain.c @@ -96,6 +96,9 @@ int ff_rtp_chain_mux_open(AVFormatContext **out, AVFormatContext *s, return ret; } + /* Copy the RTP AVStream timebase back to the original AVStream */ + st->time_base = rtpctx->streams[0]->time_base; + *out = rtpctx; return 0;