From 0550b58f4e8091959242f57d15be50e2bf23880f Mon Sep 17 00:00:00 2001
From: Luca Abeni <lucabe72@email.it>
Date: Mon, 16 Feb 2009 09:36:21 +0000
Subject: [PATCH] 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
---
libavformat/rtp.c | 2 +-
libavformat/rtp.h | 2 +-
libavformat/rtpenc.c | 2 +-
libavformat/sdp.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavformat/rtp.c b/libavformat/rtp.c
index d284f638df3..94fc2731289 100644
--- 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 6a19225cac2..1347045f3a7 100644
--- 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 0e129acea6f..3563cbe8b1a 100644
--- 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 29090b19e56..d5312c48d97 100644
--- 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 */
}
--
GitLab