---
libavutil/opt.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/libavutil/opt.c b/libavutil/opt.c
index 833e205..24930d1 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)
--
1.7.10.4
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
