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>
pull/74/head
Michael Niedermayer 11 years ago
commit 692757062a
  1. 3
      libavformat/rtpenc_chain.c

@ -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;

Loading…
Cancel
Save