summaryrefslogtreecommitdiff
path: root/libavformat/rtpenc_chain.c
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2014-05-31 01:09:58 +0300
committerMartin Storsjö <martin@martin.st>2014-05-31 12:02:23 +0300
commitf797b134cad4d248b1c8955659997980d0668bc3 (patch)
tree1b9012c88caa1d0f06c032fe812f8895a528ed30 /libavformat/rtpenc_chain.c
parentd6d767d93e532246cacf3567e6bcad76a821f838 (diff)
downloadffmpeg-f797b134cad4d248b1c8955659997980d0668bc3.tar.gz
rtpenc_chain: Don't copy the time base to the source stream by default
Only copy it manually in the muxers where it makes sense (rtspenc, sapenc). Don't touch the original AVStream in movenchint, where the original AVStream should be kept untouched. This fixes the normal tracks in RTP hinted files after abb810db - the hint tracks were ok while the normal media tracks were broken, noticed by Michael Niedermayer. This reverts abb810db but achieves the same effect for the other muxers. Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat/rtpenc_chain.c')
-rw-r--r--libavformat/rtpenc_chain.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/libavformat/rtpenc_chain.c b/libavformat/rtpenc_chain.c
index 38062543a2..10c4020cfe 100644
--- a/libavformat/rtpenc_chain.c
+++ b/libavformat/rtpenc_chain.c
@@ -96,9 +96,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;