[SCM] libav/experimental: Revert "rtpenc_chain: Don't copy the time_base back to the caller"

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Aug 10 16:03:21 UTC 2014


The following commit has been merged in the experimental branch:
commit abb810db036628e11a5171134ebe320b187ee6d6
Author: Martin Storsjö <martin at martin.st>
Date:   Thu May 29 12:22:26 2014 +0300

    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>

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;
 

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list