diff --git a/libavformat/avio.c b/libavformat/avio.c
index a0eee9355e..a51bac1e76 100644
--- a/libavformat/avio.c
+++ b/libavformat/avio.c
@@ -208,6 +208,10 @@ int url_get_file_handle(URLContext *h)
 {
     return ffurl_get_file_handle(h);
 }
+int url_get_max_packet_size(URLContext *h)
+{
+    return h->max_packet_size;
+}
 #endif
 
 #define URL_SCHEME_CHARS                        \
@@ -368,11 +372,6 @@ int ffurl_get_file_handle(URLContext *h)
     return h->prot->url_get_file_handle(h);
 }
 
-int url_get_max_packet_size(URLContext *h)
-{
-    return h->max_packet_size;
-}
-
 void url_get_filename(URLContext *h, char *buf, int buf_size)
 {
     av_strlcpy(buf, h->filename, buf_size);
diff --git a/libavformat/avio.h b/libavformat/avio.h
index 020a75aa03..4c2b4d57a2 100644
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -112,6 +112,7 @@ attribute_deprecated int64_t url_seek(URLContext *h, int64_t pos, int whence);
 attribute_deprecated int url_close(URLContext *h);
 attribute_deprecated int64_t url_filesize(URLContext *h);
 attribute_deprecated int url_get_file_handle(URLContext *h);
+attribute_deprecated int url_get_max_packet_size(URLContext *h);
 #endif
 
 /**
@@ -120,16 +121,6 @@ attribute_deprecated int url_get_file_handle(URLContext *h);
  */
 int url_exist(const char *url);
 
-/**
- * Return the maximum packet size associated to packetized file
- * handle. If the file is not packetized (stream like HTTP or file on
- * disk), then 0 is returned.
- *
- * @param h file handle
- * @return maximum packet size in bytes
- */
-int url_get_max_packet_size(URLContext *h);
-
 /**
  * Copy the filename of the resource accessed by h to buf.
  *
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 3d088ddcc7..dd250277f2 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -828,7 +828,7 @@ int ffio_fdopen(AVIOContext **s, URLContext *h)
     uint8_t *buffer;
     int buffer_size, max_packet_size;
 
-    max_packet_size = url_get_max_packet_size(h);
+    max_packet_size = h->max_packet_size;
     if (max_packet_size) {
         buffer_size = max_packet_size; /* no need to bufferize more than one packet */
     } else {
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index b87e4b8b0d..54ca2e8469 100644
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@ -888,7 +888,7 @@ static int rtmp_open(URLContext *s, const char *uri, int flags)
         rt->flv_off  = 0;
     }
 
-    s->max_packet_size = url_get_max_packet_size(rt->stream);
+    s->max_packet_size = rt->stream->max_packet_size;
     s->is_streamed     = 1;
     return 0;
 
diff --git a/libavformat/rtpproto.c b/libavformat/rtpproto.c
index 0439bc07fc..7ffabf5eac 100644
--- a/libavformat/rtpproto.c
+++ b/libavformat/rtpproto.c
@@ -206,7 +206,7 @@ static int rtp_open(URLContext *h, const char *uri, int flags)
     s->rtp_fd = ffurl_get_file_handle(s->rtp_hd);
     s->rtcp_fd = ffurl_get_file_handle(s->rtcp_hd);
 
-    h->max_packet_size = url_get_max_packet_size(s->rtp_hd);
+    h->max_packet_size = s->rtp_hd->max_packet_size;
     h->is_streamed = 1;
     return 0;
 
diff --git a/libavformat/sapenc.c b/libavformat/sapenc.c
index 14be5a7428..c216342a4c 100644
--- a/libavformat/sapenc.c
+++ b/libavformat/sapenc.c
@@ -218,7 +218,7 @@ static int sap_write_header(AVFormatContext *s)
     pos += strlen(&sap->ann[pos]);
     sap->ann_size = pos;
 
-    if (sap->ann_size > url_get_max_packet_size(sap->ann_fd)) {
+    if (sap->ann_size > sap->ann_fd->max_packet_size) {
         av_log(s, AV_LOG_ERROR, "Announcement too large to send in one "
                                 "packet\n");
         goto fail;