| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-29 10:06:24 (GMT) |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-29 10:06:32 (GMT) |
| commit | d3e13250a0308d8fda851e064ddbbbd7e574d880 (patch) | |
| tree | a09c470513aea5c950ff25fd895934f778c1fa6c | |
| parent | e36231969af5d0b3ddccaccc2f36715d65307d5a (diff) | |
| parent | feeafb4adabd5c17de1738ed9962e40892b20edb (diff) | |
| download | ffmpeg-d3e13250a0308d8fda851e064ddbbbd7e574d880.zip ffmpeg-d3e13250a0308d8fda851e064ddbbbd7e574d880.tar.gz ffmpeg-d3e13250a0308d8fda851e064ddbbbd7e574d880.tar.bz2 | |
Merge commit 'feeafb4adabd5c17de1738ed9962e40892b20edb'
* commit 'feeafb4adabd5c17de1738ed9962e40892b20edb':
lavf: do not export av_register_{rtp,rdt}_dynamic_payload_handlers from shared objects
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/allformats.c | 4 | ||||
| -rw-r--r-- | libavformat/rdt.c | 2 | ||||
| -rw-r--r-- | libavformat/rdt.h | 2 | ||||
| -rw-r--r-- | libavformat/rtpdec.c | 2 | ||||
| -rw-r--r-- | libavformat/rtpdec.h | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 0e1b262..20f48c0 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -248,8 +248,8 @@ void av_register_all(void) REGISTER_DEMUXER (SBG, sbg); 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 3901e21..201a3e0 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 c2ec94b..ce6026f 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 b2342f1..fed4e57 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 2a191ec..9321066 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. |