# HG changeset patch # User lucabe # Date 1234776981 0 # Node ID daca5391106a3909281f06e5f8fe1743ffcafdf9 # Parent 3e5b9c1a413e2fbbcea7122b613865024cfcf7b0 Rename rtp_get_payload_type() to ff_rtp_get_payload_type(), as it is not a static function diff -r 3e5b9c1a413e -r daca5391106a rtp.c --- a/rtp.c Mon Feb 16 01:55:28 2009 +0000 +++ b/rtp.c Mon Feb 16 09:36:21 2009 +0000 @@ -93,7 +93,7 @@ return -1; } -int rtp_get_payload_type(AVCodecContext *codec) +int ff_rtp_get_payload_type(AVCodecContext *codec) { int i, payload_type; diff -r 3e5b9c1a413e -r daca5391106a rtp.h --- a/rtp.h Mon Feb 16 01:55:28 2009 +0000 +++ b/rtp.h Mon Feb 16 09:36:21 2009 +0000 @@ -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 -r 3e5b9c1a413e -r daca5391106a rtpenc.c --- a/rtpenc.c Mon Feb 16 01:55:28 2009 +0000 +++ b/rtpenc.c Mon Feb 16 09:36:21 2009 +0000 @@ -49,7 +49,7 @@ 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 -r 3e5b9c1a413e -r daca5391106a sdp.c --- a/sdp.c Mon Feb 16 01:55:28 2009 +0000 +++ b/sdp.c Mon Feb 16 09:36:21 2009 +0000 @@ -233,7 +233,7 @@ 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 */ }