Merge commit 'f797b134'

* commit 'f797b134':
  rtpenc_chain: Don't copy the time base to the source stream by default

See: 1fe40e1bMerged-by: Michael Niedermayer <michaelni@gmx.at>

libavformat/rtpenc_chain.c

@@ -98,9 +98,6 @@ 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;
 

libavformat/rtsp.c

@@ -738,6 +738,7 @@ int ff_rtsp_open_transport_ctx(AVFormatContext *s, RTSPStream *rtsp_st)
         rtsp_st->rtp_handle = NULL;
         if (ret < 0)
             return ret;
+        st->time_base = ((AVFormatContext*)rtsp_st->transport_priv)->streams[0]->time_base;
     } else if (rt->transport == RTSP_TRANSPORT_RAW) {
         return 0; // Don't need to open any parser here
     } else if (rt->transport == RTSP_TRANSPORT_RDT && CONFIG_RTPDEC)

libavformat/sapenc.c

@@ -158,6 +158,7 @@ static int sap_write_header(AVFormatContext *s)
         if (ret < 0)
             goto fail;
         s->streams[i]->priv_data = contexts[i];
+        s->streams[i]->time_base = contexts[i]->streams[0]->time_base;
         av_strlcpy(contexts[i]->filename, url, sizeof(contexts[i]->filename));
     }