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

lavf: rename avf_sdp_create to av_sdp_create.

Browse Source 
The new name is more consistent with the rest of the API.
This commit is contained in:
Anton Khirnov 2011-04-08 11:36:12 +02:00
parent a9bf9d8e53
commit c3675dfe1e
7 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ffmpeg.c
View File

@ -1797,7 +1797,7 @@ static void print_sdp(AVFormatContext **avc, int n)
{ {
char sdp[2048]; char sdp[2048];
avf_sdp_create(avc, n, sdp, sizeof(sdp)); av_sdp_create(avc, n, sdp, sizeof(sdp));
printf("SDP:\n%s\n", sdp); printf("SDP:\n%s\n", sdp);
fflush(stdout); fflush(stdout);
} }

2
ffserver.c
View File

@ -2957,7 +2957,7 @@ static int prepare_sdp_description(FFStream *stream, uint8_t **pbuffer,
avc->streams[i]->codec = stream->streams[i]->codec; avc->streams[i]->codec = stream->streams[i]->codec;
} }
*pbuffer = av_mallocz(2048); *pbuffer = av_mallocz(2048);
avf_sdp_create(&avc, 1, *pbuffer, 2048); av_sdp_create(&avc, 1, *pbuffer, 2048);
sdp_done: sdp_done:
#if !FF_API_MAX_STREAMS #if !FF_API_MAX_STREAMS

6
libavformat/avformat.h
View File

@ -1558,7 +1558,11 @@ int av_filename_number_test(const char *filename);
* @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 avf_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size); int av_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size);
#if FF_API_SDP_CREATE
attribute_deprecated int avf_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size);
#endif
/** /**
* Return a positive value if the given filename has one of the given * Return a positive value if the given filename has one of the given

2
libavformat/rtspenc.c
View File

@ -66,7 +66,7 @@ int ff_rtsp_setup_output_streams(AVFormatContext *s, const char *addr)
ff_url_join(sdp_ctx.filename, sizeof(sdp_ctx.filename), ff_url_join(sdp_ctx.filename, sizeof(sdp_ctx.filename),
"rtsp", NULL, addr, -1, NULL); "rtsp", NULL, addr, -1, NULL);
ctx_array[0] = &sdp_ctx; ctx_array[0] = &sdp_ctx;
if (avf_sdp_create(ctx_array, 1, sdp, SDP_MAX_SIZE)) { if (av_sdp_create(ctx_array, 1, sdp, SDP_MAX_SIZE)) {
av_free(sdp); av_free(sdp);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }

2
libavformat/sapenc.c
View File

@ -208,7 +208,7 @@ static int sap_write_header(AVFormatContext *s)
av_strlcpy(&sap->ann[pos], "application/sdp", sap->ann_size - pos); av_strlcpy(&sap->ann[pos], "application/sdp", sap->ann_size - pos);
pos += strlen(&sap->ann[pos]) + 1; pos += strlen(&sap->ann[pos]) + 1;
if (avf_sdp_create(contexts, s->nb_streams, &sap->ann[pos], if (av_sdp_create(contexts, s->nb_streams, &sap->ann[pos],
sap->ann_size - pos)) { sap->ann_size - pos)) {
ret = AVERROR_INVALIDDATA; ret = AVERROR_INVALIDDATA;
goto fail; goto fail;

11
libavformat/sdp.c
View File

@ -474,7 +474,7 @@ 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 avf_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size) int av_sdp_create(AVFormatContext *ac[], int n_files, char *buff, 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;
@ -531,7 +531,7 @@ int avf_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size)
return 0; return 0;
} }
#else #else
int avf_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size) int av_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size)
{ {
return AVERROR(ENOSYS); return AVERROR(ENOSYS);
} }
@ -540,3 +540,10 @@ void ff_sdp_write_media(char *buff, int size, AVCodecContext *c, const char *des
{ {
} }
#endif #endif
#if FF_API_SDP_CREATE
int avf_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size)
{
return av_sdp_create(ac, n_files, buff, size);
}
#endif

3
libavformat/version.h
View File

@ -107,5 +107,8 @@
#ifndef FF_API_GUESS_IMG2_CODEC #ifndef FF_API_GUESS_IMG2_CODEC
#define FF_API_GUESS_IMG2_CODEC (LIBAVFORMAT_VERSION_MAJOR < 54) #define FF_API_GUESS_IMG2_CODEC (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif #endif
#ifndef FF_API_SDP_CREATE
#define FF_API_SDP_CREATE (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
#endif //AVFORMAT_VERSION_H #endif //AVFORMAT_VERSION_H