diff options
| author | Martin Storsjö <martin@martin.st> | 2014-05-29 12:22:26 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2014-05-30 22:45:42 +0300 |
| commit | abb810db036628e11a5171134ebe320b187ee6d6 (patch) | |
| tree | 3d48c38744abde4e9f4ec99405c7bf6926f6bbe6 | |
| parent | 368f50359eb328b0b9d67451f56fda20b3255f9a (diff) | |
| download | ffmpeg-abb810db036628e11a5171134ebe320b187ee6d6.tar.gz | |
Revert "rtpenc_chain: Don't copy the time_base back to the caller"
While it strictly isn't necessary to copy the time base (since
any use of it is scaled in ff_write_chained), it still is better
to signal the actual time base to the caller, avoiding one
unnecessary rescaling. This also lets the caller know what the
actual internal time base is, in case that is useful info
for some caller.
This reverts commit 397ffde115f4e0482a007b672f40457596cebfc4.
Signed-off-by: Martin Storsjö <martin@martin.st>
| -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 10c4020cfe..38062543a2 100644 --- a/libavformat/rtpenc_chain.c +++ b/libavformat/rtpenc_chain.c @@ -96,6 +96,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; |