[SCM] libav/experimental: Remame rtp_get_codec_info() to ff_rtp_get_codec_info(), as it is not a static function
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:38:36 UTC 2013
The following commit has been merged in the experimental branch:
commit bf6d9818063e3a5c85e4bdce14310c6f9cc3f4de
Author: Luca Abeni <lucabe72 at email.it>
Date: Tue Feb 17 08:12:51 2009 +0000
Remame rtp_get_codec_info() to ff_rtp_get_codec_info(), as it is not
a static function
Originally committed as revision 17390 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/rtp.c b/libavformat/rtp.c
index 94fc273..6b33cee 100644
--- a/libavformat/rtp.c
+++ b/libavformat/rtp.c
@@ -74,7 +74,7 @@ static const struct
{-1, "", CODEC_TYPE_UNKNOWN, CODEC_ID_NONE, -1, -1}
};
-int rtp_get_codec_info(AVCodecContext *codec, int payload_type)
+int ff_rtp_get_codec_info(AVCodecContext *codec, int payload_type)
{
int i = 0;
diff --git a/libavformat/rtp.h b/libavformat/rtp.h
index bcc5349..f340f41 100644
--- a/libavformat/rtp.h
+++ b/libavformat/rtp.h
@@ -33,7 +33,7 @@
*/
int ff_rtp_get_payload_type(AVCodecContext *codec);
-int rtp_get_codec_info(AVCodecContext *codec, int payload_type);
+int ff_rtp_get_codec_info(AVCodecContext *codec, int payload_type);
const char *ff_rtp_enc_name(int payload_type);
enum CodecID ff_rtp_codec_id(const char *buf, enum CodecType codec_type);
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 636adce..ac8a9e1 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -425,7 +425,7 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1,
st->codec->codec_type = codec_type;
if (rtsp_st->sdp_payload_type < RTP_PT_PRIVATE) {
/* if standard payload type, we can find the codec right now */
- rtp_get_codec_info(st->codec, rtsp_st->sdp_payload_type);
+ ff_rtp_get_codec_info(st->codec, rtsp_st->sdp_payload_type);
}
}
/* put a default control url */
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list