diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-18 02:10:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-18 02:14:53 +0200 |
| commit | 986f63d17fa14e757fd11b4b50acac563bd1bb9d (patch) | |
| tree | 7503de604325d13b6cbc7cd9f9d87d36b7dc16b4 | |
| parent | 343643fdca4f438020e6a035cb9660ed772e7c88 (diff) | |
| parent | 2bb2c2bd75e5f4b28a945511cda77e0a1a44c758 (diff) | |
| download | ffmpeg-986f63d17fa14e757fd11b4b50acac563bd1bb9d.tar.gz | |
Merge commit '2bb2c2bd75e5f4b28a945511cda77e0a1a44c758'
* commit '2bb2c2bd75e5f4b28a945511cda77e0a1a44c758':
rtpenc_chain: Pass the initial time_base hint on to the chained muxer
See: [FFmpeg-devel] [PATCH] avformat/rtpenc_chain: Set timebase
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/rtpenc_chain.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/rtpenc_chain.c b/libavformat/rtpenc_chain.c index dea1f70dac..b2aa12471f 100644 --- a/libavformat/rtpenc_chain.c +++ b/libavformat/rtpenc_chain.c @@ -75,6 +75,7 @@ int ff_rtp_chain_mux_open(AVFormatContext **out, AVFormatContext *s, rtpctx->start_time_realtime = s->start_time_realtime; avcodec_copy_context(rtpctx->streams[0]->codec, st->codec); + rtpctx->streams[0]->time_base = st->time_base; if (handle) { ret = ffio_fdopen(&rtpctx->pb, handle); |