diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-01 22:08:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-01 22:08:44 +0200 |
| commit | 58677d73ed43020ea0840e633588e344396ee256 (patch) | |
| tree | ee96724ecd357d71717e99263c4104ad380b79bc /libavutil | |
| parent | acc3c380cb010451e8e336b622e7ae446709d5c2 (diff) | |
| parent | 6248694861f0c414571fadba447a0c1cab95284e (diff) | |
| download | ffmpeg-58677d73ed43020ea0840e633588e344396ee256.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: fix some bugs introduced in 630902a1e1336e7ee0cf3dcbcb6eb07af8edf660
libmp3lame: fix typo
AVOptions: drop av_ prefix from static av_get_number().
libx264: use X264_THREADS_AUTO constant instead of 0.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/opt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavutil/opt.c b/libavutil/opt.c index e56cdc65e7..43823690aa 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -260,7 +260,7 @@ const char *av_get_string(void *obj, const char *name, const AVOption **o_out, c 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, AV_OPT_SEARCH_CHILDREN); 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; - 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; } @@ -304,7 +304,7 @@ AVRational av_get_q(void *obj, const char *name, const AVOption **o_out) 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}; @@ -318,7 +318,7 @@ int64_t av_get_int(void *obj, const char *name, const AVOption **o_out) 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; } |