ffmpeg | branch: master | Lukasz Marek <lukasz.m.lu...@gmail.com> | Thu Nov 27 00:11:01 2014 +0100| [8833f1508b7b6afc3172a8017934a7a54428c686] | committer: Martin Storsjö
opt: Add const to av_opt_next Also add const to pointers in static functions within opt.c where possible/necessary. Signed-off-by: Martin Storsjö <mar...@martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8833f1508b7b6afc3172a8017934a7a54428c686 --- libavutil/opt.c | 4 ++-- libavutil/opt.h | 2 +- libavutil/version.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index f2e3e6d..c5a1933 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -34,7 +34,7 @@ #include "log.h" #include "mathematics.h" -const AVOption *av_opt_next(void *obj, const AVOption *last) +const AVOption *av_opt_next(const void *obj, const AVOption *last) { AVClass *class = *(AVClass**)obj; if (!last && class->option && class->option[0].name) @@ -44,7 +44,7 @@ const AVOption *av_opt_next(void *obj, const AVOption *last) return NULL; } -static int read_number(const AVOption *o, void *dst, double *num, int *den, int64_t *intnum) +static int read_number(const AVOption *o, const void *dst, double *num, int *den, int64_t *intnum) { switch (o->type) { case AV_OPT_TYPE_FLAGS: *intnum = *(unsigned int*)dst;return 0; diff --git a/libavutil/opt.h b/libavutil/opt.h index 8413206..99d727c 100644 --- a/libavutil/opt.h +++ b/libavutil/opt.h @@ -448,7 +448,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(void *obj, const AVOption *prev); +const AVOption *av_opt_next(const void *obj, const AVOption *prev); /** * Iterate over AVOptions-enabled children of obj. diff --git a/libavutil/version.h b/libavutil/version.h index fdd27e3..235cdfd 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -55,7 +55,7 @@ #define LIBAVUTIL_VERSION_MAJOR 55 #define LIBAVUTIL_VERSION_MINOR 9 -#define LIBAVUTIL_VERSION_MICRO 0 +#define LIBAVUTIL_VERSION_MICRO 1 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
