Merge remote-tracking branch 'newdev/master'

[ffmpeg] / libavformat / rtpenc.c

diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c
index b32a9a4041e71e5b05b60d0093dca98d85323aaa..71ccdabf4a038b2510305b861c5e89929e907c96 100644 (file)
--- a/libavformat/rtpenc.c
+++ b/libavformat/rtpenc.c
@@ -93,7 +93,7 @@ static int rtp_write_header(AVFormatContext *s1)
         s->first_rtcp_ntp_time = (s1->start_time_realtime / 1000) * 1000 +
                                  NTP_OFFSET_US;
 
-    max_packet_size = url_fget_max_packet_size(s1->pb);
+    max_packet_size = s1->pb->max_packet_size;
     if (max_packet_size <= 12)
         return AVERROR(EIO);
     s->buf = av_malloc(max_packet_size);
@@ -206,7 +206,7 @@ static void rtcp_send_sr(AVFormatContext *s1, int64_t ntp_time)
     avio_wb32(s1->pb, rtp_ts);
     avio_wb32(s1->pb, s->packet_count);
     avio_wb32(s1->pb, s->octet_count);
-    put_flush_packet(s1->pb);
+    avio_flush(s1->pb);
 }
 
 /* send an rtp packet. sequence number is incremented, but the caller
@@ -225,7 +225,7 @@ void ff_rtp_send_data(AVFormatContext *s1, const uint8_t *buf1, int len, int m)
     avio_wb32(s1->pb, s->ssrc);
 
     avio_write(s1->pb, buf1, len);
-    put_flush_packet(s1->pb);
+    avio_flush(s1->pb);
 
     s->seq++;
     s->octet_count += len;