summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2010-02-10 19:33:08 +0000
committerLuca Abeni <lucabe72@email.it>2010-02-10 19:33:08 +0000
commit4e8052ddad23bc56a3f4f11e1d1c0ed6a1a9ad91 (patch)
tree2e3bb8f5cf2f9ed405c53ceeab5c86d6534bd241
parent7515ed0c1d82f76029eca00b78ad018498c46d83 (diff)
Fix syncronisation for streams with a high encoding delay.
Patch by Timo Teräs (timo DOT teras AT iki DOT fi) Originally committed as revision 21743 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/rtpenc.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c
index 640306aaec..9a3eee96d3 100644
--- a/libavformat/rtpenc.c
+++ b/libavformat/rtpenc.c
@@ -91,7 +91,7 @@ static int rtp_write_header(AVFormatContext *s1)
s->cur_timestamp = 0;
s->ssrc = 0; /* FIXME: was random(), what should this be? */
s->first_packet = 1;
- s->first_rtcp_ntp_time = AV_NOPTS_VALUE;
+ s->first_rtcp_ntp_time = ntp_time();
max_packet_size = url_fget_max_packet_size(s1->pb);
if (max_packet_size <= 12)
@@ -171,7 +171,6 @@ static void rtcp_send_sr(AVFormatContext *s1, int64_t ntp_time)
dprintf(s1, "RTCP: %02x %"PRIx64" %x\n", s->payload_type, ntp_time, s->timestamp);
- if (s->first_rtcp_ntp_time == AV_NOPTS_VALUE) s->first_rtcp_ntp_time = ntp_time;
s->last_rtcp_ntp_time = ntp_time;
rtp_ts = av_rescale_q(ntp_time - s->first_rtcp_ntp_time, (AVRational){1, 1000000},
s1->streams[0]->time_base) + s->base_timestamp;