virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

lavu/opt: drop an always-NULL argument to get_number()

Browse Source
This commit is contained in:
Anton Khirnov
2024-02-08 16:02:14 +01:00
parent 9fabdd64b2
commit 84ba46fa5e
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavutil/opt.c
View File

@@ -965,7 +965,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
return *out_val ? 0 : AVERROR(ENOMEM); return *out_val ? 0 : AVERROR(ENOMEM);
} }
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;
@@ -975,8 +975,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:
@@ -991,7 +989,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;
if (num == den) if (num == den)
*out_val = intnum; *out_val = intnum;
@@ -1006,7 +1004,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;
@@ -1018,7 +1016,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)
@@ -1052,7 +1050,7 @@ int av_opt_get_video_rate(void *obj, const char *name, int search_flags, AVRatio
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)