Browse Source

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ö <martin@martin.st>
tags/n3.1
Lukasz Marek Martin Storsjö 11 years ago
parent
commit
8833f1508b
3 changed files with 4 additions and 4 deletions
  1. +2
    -2
      libavutil/opt.c
  2. +1
    -1
      libavutil/opt.h
  3. +1
    -1
      libavutil/version.h

+ 2
- 2
libavutil/opt.c View File

@@ -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;


+ 1
- 1
libavutil/opt.h View File

@@ -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.


+ 1
- 1
libavutil/version.h View File

@@ -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, \


Loading…
Cancel
Save