diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-30 22:03:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-30 22:03:51 +0200 |
| commit | 692757062a89c0be5e3da8d55a652339afe679ec (patch) | |
| tree | d499f603da939e2a73b62b2e2f2341592ff0cb7b | |
| parent | d136fe6fd7be03b3edc87bb19c81a09a31b1a733 (diff) | |
| parent | abb810db036628e11a5171134ebe320b187ee6d6 (diff) | |
| download | ffmpeg-692757062a89c0be5e3da8d55a652339afe679ec.tar.gz | |
Merge commit 'abb810db036628e11a5171134ebe320b187ee6d6'
* commit 'abb810db036628e11a5171134ebe320b187ee6d6':
Revert "rtpenc_chain: Don't copy the time_base back to the caller"
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/rtpenc_chain.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/rtpenc_chain.c b/libavformat/rtpenc_chain.c index dea1f70dac..794bd47fb8 100644 --- a/libavformat/rtpenc_chain.c +++ b/libavformat/rtpenc_chain.c @@ -98,6 +98,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; |