[FFmpeg-cvslog] r21743 - trunk/libavformat/rtpenc.c

[lucabe]

Author: lucabe
Date: Wed Feb 10 20:33:08 2010
New Revision: 21743

Log:
Fix syncronisation for streams with a high encoding delay.
Patch by Timo Ter?s (timo DOT teras AT iki DOT fi)

Modified:
   trunk/libavformat/rtpenc.c

Modified: trunk/libavformat/rtpenc.c
==============================================================================
--- trunk/libavformat/rtpenc.c	Wed Feb 10 19:31:47 2010	(r21742)
+++ trunk/libavformat/rtpenc.c	Wed Feb 10 20:33:08 2010	(r21743)
@@ -91,7 +91,7 @@ static int rtp_write_header(AVFormatCont
     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
 
     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;