diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-31 12:37:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-31 12:53:46 +0200 |
| commit | 8c895ae73f81a5db66f3bfeac3d91da5c4e179e2 (patch) | |
| tree | 91232c2e193df19a9bb1a22657f3e3e07cb610df | |
| parent | 4ba8560077a19ae12bf0c875c57cdaa72d690441 (diff) | |
| parent | f797b134cad4d248b1c8955659997980d0668bc3 (diff) | |
Merge commit 'f797b134cad4d248b1c8955659997980d0668bc3'
* commit 'f797b134cad4d248b1c8955659997980d0668bc3':
rtpenc_chain: Don't copy the time base to the source stream by default
See: 1fe40e1b0538a8eb8425123c47775b5d141ae084
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/rtpenc_chain.c | 3 | ||||
| -rw-r--r-- | libavformat/rtsp.c | 1 | ||||
| -rw-r--r-- | libavformat/sapenc.c | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/libavformat/rtpenc_chain.c b/libavformat/rtpenc_chain.c index 794bd47fb8..dea1f70dac 100644 --- a/libavformat/rtpenc_chain.c +++ b/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; diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index fcf9eca0d4..d25838a074 100644 --- a/libavformat/rtsp.c +++ b/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) diff --git a/libavformat/sapenc.c b/libavformat/sapenc.c index 2564698e7b..82a6ef67fd 100644 --- a/libavformat/sapenc.c +++ b/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)); } |