@@ -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);

@@ -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);

@@ -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.

@@ -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);

@@ -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.