mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-08-21 08:45:06 +02:00
AVOptions: drop av_ prefix from static av_get_number().
This commit is contained in:
parent
1440037411
commit
bea5670a4f
@ -261,7 +261,7 @@ const char *av_get_string(void *obj, const char *name, const AVOption **o_out, c
|
|||||||
return buf;
|
return buf;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int av_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, const AVOption **o_out, double *num, int *den, int64_t *intnum)
|
||||||
{
|
{
|
||||||
const AVOption *o = av_opt_find(obj, name, NULL, 0, 0);
|
const AVOption *o = av_opt_find(obj, name, NULL, 0, 0);
|
||||||
void *dst;
|
void *dst;
|
||||||
@ -293,7 +293,7 @@ double av_get_double(void *obj, const char *name, const AVOption **o_out)
|
|||||||
double num=1;
|
double num=1;
|
||||||
int den=1;
|
int den=1;
|
||||||
|
|
||||||
if (av_get_number(obj, name, o_out, &num, &den, &intnum) < 0)
|
if (get_number(obj, name, o_out, &num, &den, &intnum) < 0)
|
||||||
return NAN;
|
return NAN;
|
||||||
return num*intnum/den;
|
return num*intnum/den;
|
||||||
}
|
}
|
||||||
@ -304,7 +304,7 @@ AVRational av_get_q(void *obj, const char *name, const AVOption **o_out)
|
|||||||
double num=1;
|
double num=1;
|
||||||
int den=1;
|
int den=1;
|
||||||
|
|
||||||
if (av_get_number(obj, name, o_out, &num, &den, &intnum) < 0)
|
if (get_number(obj, name, o_out, &num, &den, &intnum) < 0)
|
||||||
return (AVRational){0, 0};
|
return (AVRational){0, 0};
|
||||||
if (num == 1.0 && (int)intnum == intnum)
|
if (num == 1.0 && (int)intnum == intnum)
|
||||||
return (AVRational){intnum, den};
|
return (AVRational){intnum, den};
|
||||||
@ -318,7 +318,7 @@ int64_t av_get_int(void *obj, const char *name, const AVOption **o_out)
|
|||||||
double num=1;
|
double num=1;
|
||||||
int den=1;
|
int den=1;
|
||||||
|
|
||||||
if (av_get_number(obj, name, o_out, &num, &den, &intnum) < 0)
|
if (get_number(obj, name, o_out, &num, &den, &intnum) < 0)
|
||||||
return -1;
|
return -1;
|
||||||
return num*intnum/den;
|
return num*intnum/den;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user