Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2008-12-20 01:37:56 +0300
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2008-12-20 01:37:56 +0300
commit64e74b68a40a8d0656989cffd12b59ba688965cb (patch)
tree573ca0c7c5378ba824c2213da678a7fc02d096bf /libavcodec/opt.c
parent5c548937e0f54bf72fefbf3696f71f8b6bb6ffd0 (diff)
Put under #if LIBAVCODEC_VERSION_MAJOR < 53 the deprecated functions
av_set_string() and av_set_string2(), they will be dropped at the next major bump. Originally committed as revision 16243 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/opt.c')
-rw-r--r--libavcodec/opt.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/opt.c b/libavcodec/opt.c
index 1c0bb6c7a8..78fbfaeb57 100644
--- a/libavcodec/opt.c
+++ b/libavcodec/opt.c
@@ -199,6 +199,7 @@ int av_set_string3(void *obj, const char *name, const char *val, int alloc, cons
return 0;
}
+#if LIBAVCODEC_VERSION_MAJOR < 53
const AVOption *av_set_string2(void *obj, const char *name, const char *val, int alloc){
const AVOption *o;
if (av_set_string3(obj, name, val, alloc, &o) < 0)
@@ -212,6 +213,7 @@ const AVOption *av_set_string(void *obj, const char *name, const char *val){
return NULL;
return o;
}
+#endif
const AVOption *av_set_double(void *obj, const char *name, double n){
return av_set_number(obj, name, n, 1, 1);