[FFmpeg-cvslog] Revert "rtpenc_chain: Don't copy the time_base back to the caller"

Martin Storsjö git at videolan.org
Fri May 30 22:58:57 CEST 2014


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Thu May 29 12:22:26 2014 +0300| [abb810db036628e11a5171134ebe320b187ee6d6] | committer: Martin Storsjö

Revert "rtpenc_chain: Don't copy the time_base back to the caller"

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ö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=abb810db036628e11a5171134ebe320b187ee6d6
---

 libavformat/rtpenc_chain.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavformat/rtpenc_chain.c b/libavformat/rtpenc_chain.c
index 10c4020..3806254 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;
 



More information about the ffmpeg-cvslog mailing list