avformat/rtpdec: Make ff_rtp_handler_iterate() static

Possible since 6197453. Signed-off-by: Andreas Rheinhardt <[email protected]>
SaschaVasarrhelyi · Sep 8, 2021 · 3008a93 · 3008a93
1 parent cd3d7b0
commit 3008a93
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c
@@ -135,7 +135,16 @@ static const RTPDynamicProtocolHandler *const rtp_dynamic_protocol_handler_list[
     NULL,
 };
 
-const RTPDynamicProtocolHandler *ff_rtp_handler_iterate(void **opaque)
+/**
+ * Iterate over all registered rtp dynamic protocol handlers.
+ *
+ * @param opaque a pointer where libavformat will store the iteration state.
+ *               Must point to NULL to start the iteration.
+ *
+ * @return the next registered rtp dynamic protocol handler
+ *         or NULL when the iteration is finished
+ */
+static const RTPDynamicProtocolHandler *rtp_handler_iterate(void **opaque)
 {
     uintptr_t i = (uintptr_t)*opaque;
     const RTPDynamicProtocolHandler *r = rtp_dynamic_protocol_handler_list[i];
@@ -151,7 +160,7 @@ const RTPDynamicProtocolHandler *ff_rtp_handler_find_by_name(const char *name,
 {
     void *i = 0;
     const RTPDynamicProtocolHandler *handler;
-    while (handler = ff_rtp_handler_iterate(&i)) {
+    while (handler = rtp_handler_iterate(&i)) {
         if (handler->enc_name &&
             !av_strcasecmp(name, handler->enc_name) &&
             codec_type == handler->codec_type)
@@ -165,7 +174,7 @@ const RTPDynamicProtocolHandler *ff_rtp_handler_find_by_id(int id,
 {
     void *i = 0;
     const RTPDynamicProtocolHandler *handler;
-    while (handler = ff_rtp_handler_iterate(&i)) {
+    while (handler = rtp_handler_iterate(&i)) {
         if (handler->static_payload_id && handler->static_payload_id == id &&
             codec_type == handler->codec_type)
             return handler;

diff --git a/libavformat/rtpdec.h b/libavformat/rtpdec.h
@@ -190,16 +190,6 @@ struct RTPDemuxContext {
     PayloadContext *dynamic_protocol_context;
 };
 
-/**
- * Iterate over all registered rtp dynamic protocol handlers.
- *
- * @param opaque a pointer where libavformat will store the iteration state. Must
- *               point to NULL to start the iteration.
- *
- * @return the next registered rtp dynamic protocol handler or NULL when the iteration is
- *         finished
- */
-const RTPDynamicProtocolHandler *ff_rtp_handler_iterate(void **opaque);
 /**
  * Find a registered rtp dynamic protocol handler with the specified name.
  *