Rename rtp_get_payload_type() to ff_rtp_get_payload_type(), as it is not

a static function

Originally committed as revision 17364 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/rtp.c b/libavformat/rtp.c
index d284f638df377f486080aeca844a1d20b0ddaa24..94fc2731289490c6721b5765dc2239ef21aa54f9 100644 (file)
--- a/libavformat/rtp.c
+++ b/libavformat/rtp.c
@@ -93,7 +93,7 @@ int rtp_get_codec_info(AVCodecContext *codec, int payload_type)
     return -1;
 }
 
-int rtp_get_payload_type(AVCodecContext *codec)
+int ff_rtp_get_payload_type(AVCodecContext *codec)
 {
     int i, payload_type;
 

diff --git a/libavformat/rtp.h b/libavformat/rtp.h
index 6a19225cac271d6522c53ed8d0a7e9d9ac9ea3f5..1347045f3a751ec76b640c9dff45e16933015c27 100644 (file)
--- a/libavformat/rtp.h
+++ b/libavformat/rtp.h
@@ -24,7 +24,7 @@
 #include "libavcodec/avcodec.h"
 
 /** return < 0 if unknown payload type */
-int rtp_get_payload_type(AVCodecContext *codec);
+int ff_rtp_get_payload_type(AVCodecContext *codec);
 
 #define RTP_PT_PRIVATE 96
 #define RTP_VERSION 2

diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c
index 0e129acea6f9d027cb733cc4e3142dfc48061dd5..3563cbe8b1aa4be82ac7b3ca077ed4e2991c96b8 100644 (file)
--- a/libavformat/rtpenc.c
+++ b/libavformat/rtpenc.c
@@ -49,7 +49,7 @@ static int rtp_write_header(AVFormatContext *s1)
         return -1;
     st = s1->streams[0];
 
-    payload_type = rtp_get_payload_type(st->codec);
+    payload_type = ff_rtp_get_payload_type(st->codec);
     if (payload_type < 0)
         payload_type = RTP_PT_PRIVATE; /* private payload type */
     s->payload_type = payload_type;

diff --git a/libavformat/sdp.c b/libavformat/sdp.c
index 29090b19e56ccddecba5b0369c052fd5fa739ec1..d5312c48d9730c502cab3a8bb83f8e99f9a2f35a 100644 (file)
--- a/libavformat/sdp.c
+++ b/libavformat/sdp.c
@@ -233,7 +233,7 @@ static void sdp_write_media(char *buff, int size, AVCodecContext *c, const char
     const char *type;
     int payload_type;
 
-    payload_type = rtp_get_payload_type(c);
+    payload_type = ff_rtp_get_payload_type(c);
     if (payload_type < 0) {
         payload_type = 96;  /* FIXME: how to assign a private pt? rtp.c is broken too */
     }