[FFmpeg-cvslog] lavf: do not export av_register_{rtp, rdt}_dynamic_payload_handlers from shared objects

Anton Khirnov git at videolan.org
Tue Oct 29 11:14:42 CET 2013


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Mon Oct 28 07:31:13 2013 +0100| [feeafb4adabd5c17de1738ed9962e40892b20edb] | committer: Anton Khirnov

lavf: do not export av_register_{rtp,rdt}_dynamic_payload_handlers from shared objects

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=feeafb4adabd5c17de1738ed9962e40892b20edb
---

 libavformat/allformats.c |    4 ++--
 libavformat/rdt.c        |    2 +-
 libavformat/rdt.h        |    2 +-
 libavformat/rtpdec.c     |    2 +-
 libavformat/rtpdec.h     |    2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 36a782b..d72a127 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -210,8 +210,8 @@ void av_register_all(void)
     REGISTER_MUXDEMUX(SAP,              sap);
     REGISTER_DEMUXER (SDP,              sdp);
 #if CONFIG_RTPDEC
-    av_register_rtp_dynamic_payload_handlers();
-    av_register_rdt_dynamic_payload_handlers();
+    ff_register_rtp_dynamic_payload_handlers();
+    ff_register_rdt_dynamic_payload_handlers();
 #endif
     REGISTER_DEMUXER (SEGAFILM,         segafilm);
     REGISTER_MUXER   (SEGMENT,          segment);
diff --git a/libavformat/rdt.c b/libavformat/rdt.c
index 33b0eb8..a90c168 100644
--- a/libavformat/rdt.c
+++ b/libavformat/rdt.c
@@ -564,7 +564,7 @@ RDT_HANDLER(live_audio, "x-pn-multirate-realaudio-live", AVMEDIA_TYPE_AUDIO);
 RDT_HANDLER(video,      "x-pn-realvideo",                AVMEDIA_TYPE_VIDEO);
 RDT_HANDLER(audio,      "x-pn-realaudio",                AVMEDIA_TYPE_AUDIO);
 
-void av_register_rdt_dynamic_payload_handlers(void)
+void ff_register_rdt_dynamic_payload_handlers(void)
 {
     ff_register_dynamic_payload_handler(&rdt_video_handler);
     ff_register_dynamic_payload_handler(&rdt_audio_handler);
diff --git a/libavformat/rdt.h b/libavformat/rdt.h
index a393299..bd16890 100644
--- a/libavformat/rdt.h
+++ b/libavformat/rdt.h
@@ -62,7 +62,7 @@ void ff_rdt_calc_response_and_checksum(char response[41], char chksum[9],
 /**
  * Register RDT-related dynamic payload handlers with our cache.
  */
-void av_register_rdt_dynamic_payload_handlers(void);
+void ff_register_rdt_dynamic_payload_handlers(void);
 
 /**
  * Add subscription information to Subscribe parameter string.
diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c
index e910021..3984489 100644
--- a/libavformat/rtpdec.c
+++ b/libavformat/rtpdec.c
@@ -58,7 +58,7 @@ void ff_register_dynamic_payload_handler(RTPDynamicProtocolHandler *handler)
     rtp_first_dynamic_payload_handler = handler;
 }
 
-void av_register_rtp_dynamic_payload_handlers(void)
+void ff_register_rtp_dynamic_payload_handlers(void)
 {
     ff_register_dynamic_payload_handler(&ff_amr_nb_dynamic_handler);
     ff_register_dynamic_payload_handler(&ff_amr_wb_dynamic_handler);
diff --git a/libavformat/rtpdec.h b/libavformat/rtpdec.h
index 5539936..6b16117 100644
--- a/libavformat/rtpdec.h
+++ b/libavformat/rtpdec.h
@@ -205,7 +205,7 @@ int ff_parse_fmtp(AVStream *stream, PayloadContext *data, const char *p,
                                     PayloadContext *data,
                                     char *attr, char *value));
 
-void av_register_rtp_dynamic_payload_handlers(void);
+void ff_register_rtp_dynamic_payload_handlers(void);
 
 /**
  * Close the dynamic buffer and make a packet from it.



More information about the ffmpeg-cvslog mailing list