diff options
| author | Anton Khirnov | 2013-03-12 18:09:48 +0100 |
|---|---|---|
| committer | Anton Khirnov | 2013-03-16 05:35:20 +0100 |
| commit | 9676b9a2cdc4a90611188fc48d8d388e427997c5 (patch) | |
| tree | c34a6a8eacee73e7559c9355d1b97349e61155dd /libavutil/opt.c | |
| parent | ef4d34aa7ee7bce9a63b308b640d56d053e5229a (diff) | |
AVOption: remove an unused function parameter.
Diffstat (limited to 'libavutil/opt.c')
| -rw-r--r-- | libavutil/opt.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libavutil/opt.c b/libavutil/opt.c index 04f441338d..661a61bca5 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -349,7 +349,7 @@ int av_opt_get(void *obj, const char *name, int search_flags, uint8_t **out_val) return 0; } -static int get_number(void *obj, const char *name, const AVOption **o_out, double *num, int *den, int64_t *intnum, +static int get_number(void *obj, const char *name, double *num, int *den, int64_t *intnum, int search_flags) { void *dst, *target_obj; @@ -359,8 +359,6 @@ static int get_number(void *obj, const char *name, const AVOption **o_out, doubl dst = ((uint8_t*)target_obj) + o->offset; - if (o_out) *o_out= o; - return read_number(o, dst, num, den, intnum); error: @@ -374,7 +372,7 @@ int av_opt_get_int(void *obj, const char *name, int search_flags, int64_t *out_v double num = 1; int ret, den = 1; - if ((ret = get_number(obj, name, NULL, &num, &den, &intnum, search_flags)) < 0) + if ((ret = get_number(obj, name, &num, &den, &intnum, search_flags)) < 0) return ret; *out_val = num*intnum/den; return 0; @@ -386,7 +384,7 @@ int av_opt_get_double(void *obj, const char *name, int search_flags, double *out double num = 1; int ret, den = 1; - if ((ret = get_number(obj, name, NULL, &num, &den, &intnum, search_flags)) < 0) + if ((ret = get_number(obj, name, &num, &den, &intnum, search_flags)) < 0) return ret; *out_val = num*intnum/den; return 0; @@ -398,7 +396,7 @@ int av_opt_get_q(void *obj, const char *name, int search_flags, AVRational *out_ double num = 1; int ret, den = 1; - if ((ret = get_number(obj, name, NULL, &num, &den, &intnum, search_flags)) < 0) + if ((ret = get_number(obj, name, &num, &den, &intnum, search_flags)) < 0) return ret; if (num == 1.0 && (int)intnum == intnum) |