generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavf: rename a parameter of av_sdp_create from buff->buf

Browse Source 
This is more consistent with the rest of the API.
This commit is contained in:
Anton Khirnov 2011-04-08 12:22:39 +02:00
parent c3675dfe1e
commit c234d40bd9
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/avformat.h
View File

@ -1553,12 +1553,12 @@ int av_filename_number_test(const char *filename);
* all the contexts in the array (an AVCodecContext per RTP stream) * all the contexts in the array (an AVCodecContext per RTP stream)
* must contain only one AVStream. * must contain only one AVStream.
* @param n_files number of AVCodecContexts contained in ac * @param n_files number of AVCodecContexts contained in ac
* @param buff buffer where the SDP will be stored (must be allocated by * @param buf buffer where the SDP will be stored (must be allocated by
* the caller) * the caller)
* @param size the size of the buffer * @param size the size of the buffer
* @return 0 if OK, AVERROR_xxx on error * @return 0 if OK, AVERROR_xxx on error
*/ */
int av_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size); int av_sdp_create(AVFormatContext *ac[], int n_files, char *buf, int size);
#if FF_API_SDP_CREATE #if FF_API_SDP_CREATE
attribute_deprecated int avf_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size); attribute_deprecated int avf_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size);

12
libavformat/sdp.c
View File

@ -474,14 +474,14 @@ void ff_sdp_write_media(char *buff, int size, AVCodecContext *c, const char *des
sdp_write_media_attributes(buff, size, c, payload_type); sdp_write_media_attributes(buff, size, c, payload_type);
} }
int av_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size) int av_sdp_create(AVFormatContext *ac[], int n_files, char *buf, int size)
{ {
AVMetadataTag *title = av_metadata_get(ac[0]->metadata, "title", NULL, 0); AVMetadataTag *title = av_metadata_get(ac[0]->metadata, "title", NULL, 0);
struct sdp_session_level s; struct sdp_session_level s;
int i, j, port, ttl, is_multicast; int i, j, port, ttl, is_multicast;
char dst[32], dst_type[5]; char dst[32], dst_type[5];
memset(buff, 0, size); memset(buf, 0, size);
memset(&s, 0, sizeof(struct sdp_session_level)); memset(&s, 0, sizeof(struct sdp_session_level));
s.user = "-"; s.user = "-";
s.src_addr = "127.0.0.1"; /* FIXME: Properly set this */ s.src_addr = "127.0.0.1"; /* FIXME: Properly set this */
@ -506,7 +506,7 @@ int av_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size)
} }
} }
} }
sdp_write_header(buff, size, &s); sdp_write_header(buf, size, &s);
dst[0] = 0; dst[0] = 0;
for (i = 0; i < n_files; i++) { for (i = 0; i < n_files; i++) {
@ -518,11 +518,11 @@ int av_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size)
ttl = 0; ttl = 0;
} }
for (j = 0; j < ac[i]->nb_streams; j++) { for (j = 0; j < ac[i]->nb_streams; j++) {
ff_sdp_write_media(buff, size, ff_sdp_write_media(buf, size,
ac[i]->streams[j]->codec, dst[0] ? dst : NULL, ac[i]->streams[j]->codec, dst[0] ? dst : NULL,
dst_type, (port > 0) ? port + j * 2 : 0, ttl); dst_type, (port > 0) ? port + j * 2 : 0, ttl);
if (port <= 0) { if (port <= 0) {
av_strlcatf(buff, size, av_strlcatf(buf, size,
"a=control:streamid=%d\r\n", i + j); "a=control:streamid=%d\r\n", i + j);
} }
} }
@ -531,7 +531,7 @@ int av_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size)
return 0; return 0;
} }
#else #else
int av_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size) int av_sdp_create(AVFormatContext *ac[], int n_files, char *buf, int size)
{ {
return AVERROR(ENOSYS); return AVERROR(ENOSYS);
} }