summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2008-09-07 01:19:26 +0000
committerRonald S. Bultje <rsbultje@gmail.com>2008-09-07 01:19:26 +0000
commit0369d2b045f41ab274fca700e23811ec5918b857 (patch)
treed435741a566a6cefb34a2262903197d68a21ed1d
parent74cf4819704968432c0bd1fa0aceff11da79c535 (diff)
Give register_dynamic_payload_handler() in rtpdec.c a ff_ prefix and export
it so that I can use it in rdt.c as well. See discussion in "Realmedia patch" thread on ML. Originally committed as revision 15233 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/rtp_internal.h1
-rw-r--r--libavformat/rtpdec.c8
2 files changed, 5 insertions, 4 deletions
diff --git a/libavformat/rtp_internal.h b/libavformat/rtp_internal.h
index dbf192c568..fdfb8ff02f 100644
--- a/libavformat/rtp_internal.h
+++ b/libavformat/rtp_internal.h
@@ -118,6 +118,7 @@ struct RTPDemuxContext {
};
extern RTPDynamicProtocolHandler *RTPFirstDynamicPayloadHandler;
+void ff_register_dynamic_payload_handler(RTPDynamicProtocolHandler *handler);
int rtsp_next_attr_and_value(const char **p, char *attr, int attr_size, char *value, int value_size); ///< from rtsp.c, but used by rtp dynamic protocol handlers.
diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c
index 70b29e73dd..9fb06ee5ab 100644
--- a/libavformat/rtpdec.c
+++ b/libavformat/rtpdec.c
@@ -49,7 +49,7 @@ RTPDynamicProtocolHandler *RTPFirstDynamicPayloadHandler= NULL;
static RTPDynamicProtocolHandler mp4v_es_handler= {"MP4V-ES", CODEC_TYPE_VIDEO, CODEC_ID_MPEG4};
static RTPDynamicProtocolHandler mpeg4_generic_handler= {"mpeg4-generic", CODEC_TYPE_AUDIO, CODEC_ID_AAC};
-static void register_dynamic_payload_handler(RTPDynamicProtocolHandler *handler)
+void ff_register_dynamic_payload_handler(RTPDynamicProtocolHandler *handler)
{
handler->next= RTPFirstDynamicPayloadHandler;
RTPFirstDynamicPayloadHandler= handler;
@@ -57,9 +57,9 @@ static void register_dynamic_payload_handler(RTPDynamicProtocolHandler *handler)
void av_register_rtp_dynamic_payload_handlers(void)
{
- register_dynamic_payload_handler(&mp4v_es_handler);
- register_dynamic_payload_handler(&mpeg4_generic_handler);
- register_dynamic_payload_handler(&ff_h264_dynamic_handler);
+ ff_register_dynamic_payload_handler(&mp4v_es_handler);
+ ff_register_dynamic_payload_handler(&mpeg4_generic_handler);
+ ff_register_dynamic_payload_handler(&ff_h264_dynamic_handler);
}
static int rtcp_parse_packet(RTPDemuxContext *s, const unsigned char *buf, int len)