aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-04-08 11:36:12 +0200
committerAnton Khirnov <anton@khirnov.net>2011-04-08 16:45:40 +0200
commitc3675dfe1e345a81d704fa0dd31151b8d54589ee (patch)
tree0da28405af63bbcb44d7f66f118a8b2b506ff2f1
parenta9bf9d8e5349114d37cc3baf0b1e7d95197c5ef8 (diff)
downloadffmpeg-c3675dfe1e345a81d704fa0dd31151b8d54589ee.tar.gz
lavf: rename avf_sdp_create to av_sdp_create.
The new name is more consistent with the rest of the API.
-rw-r--r--ffmpeg.c2
-rw-r--r--ffserver.c2
-rw-r--r--libavformat/avformat.h6
-rw-r--r--libavformat/rtspenc.c2
-rw-r--r--libavformat/sapenc.c2
-rw-r--r--libavformat/sdp.c11
-rw-r--r--libavformat/version.h3
7 files changed, 21 insertions, 7 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 83e77dd51f..46adb9a98d 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1797,7 +1797,7 @@ static void print_sdp(AVFormatContext **avc, int n)
{
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);
fflush(stdout);
}
diff --git a/ffserver.c b/ffserver.c
index 259aaca05e..eab8ae25ad 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -2957,7 +2957,7 @@ static int prepare_sdp_description(FFStream *stream, uint8_t **pbuffer,
avc->streams[i]->codec = stream->streams[i]->codec;
}
*pbuffer = av_mallocz(2048);
- avf_sdp_create(&avc, 1, *pbuffer, 2048);
+ av_sdp_create(&avc, 1, *pbuffer, 2048);
sdp_done:
#if !FF_API_MAX_STREAMS
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 37ec8a9bee..26fca88ca6 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1558,7 +1558,11 @@ int av_filename_number_test(const char *filename);
* @param size the size of the buffer
* @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
diff --git a/libavformat/rtspenc.c b/libavformat/rtspenc.c
index 684f2fe558..c1fc97ca8f 100644
--- a/libavformat/rtspenc.c
+++ b/libavformat/rtspenc.c
@@ -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),
"rtsp", NULL, addr, -1, NULL);
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);
return AVERROR_INVALIDDATA;
}
diff --git a/libavformat/sapenc.c b/libavformat/sapenc.c
index e675986b7d..455e65341f 100644
--- a/libavformat/sapenc.c
+++ b/libavformat/sapenc.c
@@ -208,7 +208,7 @@ static int sap_write_header(AVFormatContext *s)
av_strlcpy(&sap->ann[pos], "application/sdp", sap->ann_size - pos);
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)) {
ret = AVERROR_INVALIDDATA;
goto fail;
diff --git a/libavformat/sdp.c b/libavformat/sdp.c
index 02af7dce1d..0e46c3365f 100644
--- a/libavformat/sdp.c
+++ b/libavformat/sdp.c
@@ -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);
}
-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);
struct sdp_session_level s;
@@ -531,7 +531,7 @@ int avf_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size)
return 0;
}
#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);
}
@@ -540,3 +540,10 @@ void ff_sdp_write_media(char *buff, int size, AVCodecContext *c, const char *des
{
}
#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
diff --git a/libavformat/version.h b/libavformat/version.h
index cfe1f82393..552a1bda60 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -107,5 +107,8 @@
#ifndef FF_API_GUESS_IMG2_CODEC
#define FF_API_GUESS_IMG2_CODEC (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
+#ifndef FF_API_SDP_CREATE
+#define FF_API_SDP_CREATE (LIBAVFORMAT_VERSION_MAJOR < 54)
+#endif
#endif //AVFORMAT_VERSION_H