Commit 69275706 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'abb810db'

* commit 'abb810db':
  Revert "rtpenc_chain: Don't copy the time_base back to the caller"
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents d136fe6f abb810db
...@@ -98,6 +98,9 @@ int ff_rtp_chain_mux_open(AVFormatContext **out, AVFormatContext *s, ...@@ -98,6 +98,9 @@ int ff_rtp_chain_mux_open(AVFormatContext **out, AVFormatContext *s,
return ret; return ret;
} }
/* Copy the RTP AVStream timebase back to the original AVStream */
st->time_base = rtpctx->streams[0]->time_base;
*out = rtpctx; *out = rtpctx;
return 0; return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment