Mercurial > libavcodec.hg
changeset 8407:8903ad65c412 libavcodec
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.
| author | stefano |
|---|---|
| date | Fri, 19 Dec 2008 22:37:56 +0000 |
| parents | ea27308fa023 |
| children | c7e800518b8b |
| files | opt.c opt.h |
| diffstat | 2 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/opt.c Fri Dec 19 22:29:30 2008 +0000 +++ b/opt.c Fri Dec 19 22:37:56 2008 +0000 @@ -199,6 +199,7 @@ 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 @@ 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);
--- a/opt.h Fri Dec 19 22:29:30 2008 +0000 +++ b/opt.h Fri Dec 19 22:37:56 2008 +0000 @@ -99,6 +99,7 @@ */ const AVOption *av_find_opt(void *obj, const char *name, const char *unit, int mask, int flags); +#if LIBAVCODEC_VERSION_MAJOR < 53 /** * @see av_set_string2() */ @@ -111,6 +112,7 @@ * @see av_set_string3() */ attribute_deprecated const AVOption *av_set_string2(void *obj, const char *name, const char *val, int alloc); +#endif /** * Sets the field of obj with the given name to value.