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:
authorHendrik Leppkes <h.leppkes@gmail.com>2015-09-05 18:56:28 +0300
committerHendrik Leppkes <h.leppkes@gmail.com>2015-09-05 18:56:28 +0300
commit545559e43db5c55924bb9ecedf7465fa58f2f9a6 (patch)
tree448e07c0e1aca2530ee0953a3d805e503203f393 /libavutil/opt.h
parent2df52088ef5c4ce284af99775dfe7ad1fed03614 (diff)
Remove FF_CONST_AVUTIL55 cruft
Diffstat (limited to 'libavutil/opt.h')
-rw-r--r--libavutil/opt.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavutil/opt.h b/libavutil/opt.h
index 4f2b46e9d9..72e3a1cea9 100644
--- a/libavutil/opt.h
+++ b/libavutil/opt.h
@@ -420,7 +420,7 @@ AVRational av_get_q(void *obj, const char *name, const AVOption **o_out);
attribute_deprecated
int64_t av_get_int(void *obj, const char *name, const AVOption **o_out);
attribute_deprecated const char *av_get_string(void *obj, const char *name, const AVOption **o_out, char *buf, int buf_len);
-attribute_deprecated const AVOption *av_next_option(FF_CONST_AVUTIL55 void *obj, const AVOption *last);
+attribute_deprecated const AVOption *av_next_option(const void *obj, const AVOption *last);
#endif
/**
@@ -683,7 +683,7 @@ const AVOption *av_opt_find2(void *obj, const char *name, const char *unit,
* or NULL
* @return next AVOption or NULL
*/
-const AVOption *av_opt_next(FF_CONST_AVUTIL55 void *obj, const AVOption *prev);
+const AVOption *av_opt_next(const void *obj, const AVOption *prev);
/**
* Iterate over AVOptions-enabled children of obj.
@@ -835,7 +835,7 @@ int av_opt_query_ranges(AVOptionRanges **, void *obj, const char *key, int flags
* @param src Object to copy into
* @return 0 on success, negative on error
*/
-int av_opt_copy(void *dest, FF_CONST_AVUTIL55 void *src);
+int av_opt_copy(void *dest, const void *src);
/**
* Get a default list of allowed ranges for the given option.