X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Frtpenc.c;h=2a1c176066038291bcb6ee50c6b83c506f4c44ab;hb=bc70684e74a185d7b80c8b80bdedda659cb581b8;hp=b4f2504123c715e2e137f5b4c42fef79dff2dec5;hpb=4e4ac2034048271d280235860240c795dabeed99;p=ffmpeg

diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c
index b4f2504123c..2a1c1760660 100644
--- a/libavformat/rtpenc.c
+++ b/libavformat/rtpenc.c
@@ -124,7 +124,7 @@ static int rtp_write_header(AVFormatContext *s1)
     if (!s->ssrc)
         s->ssrc = av_get_random_seed();
     s->first_packet = 1;
-    s->first_rtcp_ntp_time = ff_ntp_time(av_gettime());
+    s->first_rtcp_ntp_time = ff_ntp_time();
     if (s1->start_time_realtime != 0  &&  s1->start_time_realtime != AV_NOPTS_VALUE)
         /* Round the NTP time to whole milliseconds. */
         s->first_rtcp_ntp_time = (s1->start_time_realtime / 1000) * 1000 +
@@ -526,9 +526,9 @@ static int rtp_write_packet(AVFormatContext *s1, AVPacket *pkt)
     rtcp_bytes = ((s->octet_count - s->last_octet_count) * RTCP_TX_RATIO_NUM) /
         RTCP_TX_RATIO_DEN;
     if ((s->first_packet || ((rtcp_bytes >= RTCP_SR_SIZE) &&
-                            (ff_ntp_time(av_gettime()) - s->last_rtcp_ntp_time > 5000000))) &&
+                            (ff_ntp_time() - s->last_rtcp_ntp_time > 5000000))) &&
         !(s->flags & FF_RTP_FLAG_SKIP_RTCP)) {
-        rtcp_send_sr(s1, ff_ntp_time(av_gettime()), 0);
+        rtcp_send_sr(s1, ff_ntp_time(), 0);
         s->last_octet_count = s->octet_count;
         s->first_packet = 0;
     }
@@ -589,7 +589,7 @@ static int rtp_write_packet(AVFormatContext *s1, AVPacket *pkt)
         break;
     case AV_CODEC_ID_H263:
         if (s->flags & FF_RTP_FLAG_RFC2190) {
-            int mb_info_size = 0;
+            size_t mb_info_size;
             const uint8_t *mb_info =
                 av_packet_get_side_data(pkt, AV_PKT_DATA_H263_MB_INFO,
                                         &mb_info_size);
@@ -642,13 +642,13 @@ static int rtp_write_trailer(AVFormatContext *s1)
     /* If the caller closes and recreates ->pb, this might actually
      * be NULL here even if it was successfully allocated at the start. */
     if (s1->pb && (s->flags & FF_RTP_FLAG_SEND_BYE))
-        rtcp_send_sr(s1, ff_ntp_time(av_gettime()), 1);
+        rtcp_send_sr(s1, ff_ntp_time(), 1);
     av_freep(&s->buf);
 
     return 0;
 }
 
-AVOutputFormat ff_rtp_muxer = {
+const AVOutputFormat ff_rtp_muxer = {
     .name              = "rtp",
     .long_name         = NULL_IF_CONFIG_SMALL("RTP output"),
     .priv_data_size    = sizeof(RTPMuxContext),