Rename functions in sdp.c for consistency's sake.
Originally committed as revision 15953 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
10ba7404d2
commit
91cd7eb633
@ -43,7 +43,7 @@ struct sdp_session_level {
|
||||
const char *name; /**< session name (can be an empty string) */
|
||||
};
|
||||
|
||||
static void dest_write(char *buff, int size, const char *dest_addr, int ttl)
|
||||
static void sdp_write_address(char *buff, int size, const char *dest_addr, int ttl)
|
||||
{
|
||||
if (dest_addr) {
|
||||
if (ttl > 0) {
|
||||
@ -65,10 +65,10 @@ static void sdp_write_header(char *buff, int size, struct sdp_session_level *s)
|
||||
s->id, s->version, s->src_addr,
|
||||
s->start_time, s->end_time,
|
||||
s->name[0] ? s->name : "No Name");
|
||||
dest_write(buff, size, s->dst_addr, s->ttl);
|
||||
sdp_write_address(buff, size, s->dst_addr, s->ttl);
|
||||
}
|
||||
|
||||
static int get_address(char *dest_addr, int size, int *ttl, const char *url)
|
||||
static int sdp_get_address(char *dest_addr, int size, int *ttl, const char *url)
|
||||
{
|
||||
int port;
|
||||
const char *p;
|
||||
@ -157,7 +157,7 @@ static char *extradata2config(AVCodecContext *c)
|
||||
return config;
|
||||
}
|
||||
|
||||
static char *sdp_media_attributes(char *buff, int size, AVCodecContext *c, int payload_type)
|
||||
static char *sdp_write_media_attributes(char *buff, int size, AVCodecContext *c, int payload_type)
|
||||
{
|
||||
char *config = NULL;
|
||||
|
||||
@ -246,12 +246,12 @@ static void sdp_write_media(char *buff, int size, AVCodecContext *c, const char
|
||||
}
|
||||
|
||||
av_strlcatf(buff, size, "m=%s %d RTP/AVP %d\r\n", type, port, payload_type);
|
||||
dest_write(buff, size, dest_addr, ttl);
|
||||
sdp_write_address(buff, size, dest_addr, ttl);
|
||||
if (c->bit_rate) {
|
||||
av_strlcatf(buff, size, "b=AS:%d\r\n", c->bit_rate / 1000);
|
||||
}
|
||||
|
||||
sdp_media_attributes(buff, size, c, payload_type);
|
||||
sdp_write_media_attributes(buff, size, c, payload_type);
|
||||
}
|
||||
|
||||
int avf_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size)
|
||||
@ -269,7 +269,7 @@ int avf_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size)
|
||||
port = 0;
|
||||
ttl = 0;
|
||||
if (n_files == 1) {
|
||||
port = get_address(dst, sizeof(dst), &ttl, ac[0]->filename);
|
||||
port = sdp_get_address(dst, sizeof(dst), &ttl, ac[0]->filename);
|
||||
if (port > 0) {
|
||||
s.dst_addr = dst;
|
||||
s.ttl = ttl;
|
||||
@ -280,7 +280,7 @@ int avf_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size)
|
||||
dst[0] = 0;
|
||||
for (i = 0; i < n_files; i++) {
|
||||
if (n_files != 1) {
|
||||
port = get_address(dst, sizeof(dst), &ttl, ac[i]->filename);
|
||||
port = sdp_get_address(dst, sizeof(dst), &ttl, ac[i]->filename);
|
||||
}
|
||||
for (j = 0; j < ac[i]->nb_streams; j++) {
|
||||
sdp_write_media(buff, size,
|
||||
|
Loading…
Reference in New Issue
Block a user