OSDN Git Service
(root)
/
coroid
/
ffmpeg_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1440037
)
AVOptions: drop av_ prefix from static av_get_number().
author
Anton Khirnov
<anton@khirnov.net>
Tue, 23 Aug 2011 08:27:49 +0000
(10:27 +0200)
committer
Anton Khirnov
<anton@khirnov.net>
Thu, 1 Sep 2011 08:37:04 +0000
(10:37 +0200)
libavutil/opt.c
patch
|
blob
|
history
diff --git
a/libavutil/opt.c
b/libavutil/opt.c
index
9c601a2
..
707977a
100644
(file)
--- a/
libavutil/opt.c
+++ b/
libavutil/opt.c
@@
-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);
void *dst;
{
const AVOption *o = av_opt_find(obj, name, NULL, 0, 0);
void *dst;
@@
-293,7
+293,7
@@
double av_get_double(void *obj, const char *name, const AVOption **o_out)
double num=1;
int den=1;
double num=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 num*intnum/den;
}
return NAN;
return num*intnum/den;
}
@@
-304,7
+304,7
@@
AVRational av_get_q(void *obj, const char *name, const AVOption **o_out)
double num=1;
int den=1;
double num=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};
if (num == 1.0 && (int)intnum == intnum)
return (AVRational){intnum, den};
return (AVRational){0, 0};
if (num == 1.0 && (int)intnum == intnum)
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;
int den=1;
double num=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 num*intnum/den;
}
return -1;
return num*intnum/den;
}