highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AVOption: remove an unused function parameter.

Browse Source
This commit is contained in:
Anton Khirnov
2013-03-12 18:09:48 +01:00
parent ef4d34aa7e
commit 9676b9a2cd
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavutil/opt.c
View File

@@ -349,7 +349,7 @@ int av_opt_get(void *obj, const char *name, int search_flags, uint8_t **out_val)
return 0; 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) int search_flags)
{ {
void *dst, *target_obj; 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; dst = ((uint8_t*)target_obj) + o->offset;
if (o_out) *o_out= o;
return read_number(o, dst, num, den, intnum); return read_number(o, dst, num, den, intnum);
error: 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; double num = 1;
int ret, den = 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; return ret;
*out_val = num*intnum/den; *out_val = num*intnum/den;
return 0; return 0;
@@ -386,7 +384,7 @@ int av_opt_get_double(void *obj, const char *name, int search_flags, double *out
double num = 1; double num = 1;
int ret, den = 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; return ret;
*out_val = num*intnum/den; *out_val = num*intnum/den;
return 0; return 0;
@@ -398,7 +396,7 @@ int av_opt_get_q(void *obj, const char *name, int search_flags, AVRational *out_
double num = 1; double num = 1;
int ret, den = 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; return ret;
if (num == 1.0 && (int)intnum == intnum) if (num == 1.0 && (int)intnum == intnum)