diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-09-05 21:44:33 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-09-07 11:20:29 +0200 |
| commit | 4dbcdfa86d1405f7e5c0ec14a4be7d2fb5903d7b (patch) | |
| tree | 0b68d009bb6d08f322af0b9c59040d9c15320c21 /libavutil/opt.c | |
| parent | 79eff9132581af69fbbd2674337b75fad29aa306 (diff) | |
AVOptions: remove AVOption.offset <= 0 checks
They will only ever be <=0 if the option is broken, in which case this
check is hiding a bug.
Diffstat (limited to 'libavutil/opt.c')
| -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 160da8d756..1dec9a67d4 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -60,7 +60,7 @@ static int av_set_number2(void *obj, const char *name, double num, int den, int6 void *dst; if (o_out) *o_out= o; - if (!o || o->offset<=0) + if (!o) return AVERROR_OPTION_NOT_FOUND; if (o->max*den < num*intnum || o->min*den > num*intnum) { @@ -124,7 +124,7 @@ int av_set_string3(void *obj, const char *name, const char *val, int alloc, cons *o_out = o; if (!o) return AVERROR_OPTION_NOT_FOUND; - if (!val || o->offset<=0) + if (!val) return AVERROR(EINVAL); if (o->type == FF_OPT_TYPE_BINARY) { @@ -234,7 +234,7 @@ const char *av_get_string(void *obj, const char *name, const AVOption **o_out, c void *dst; uint8_t *bin; int len, i; - if (!o || o->offset<=0) + if (!o) return NULL; if (o->type != FF_OPT_TYPE_STRING && (!buf || !buf_len)) return NULL; @@ -265,7 +265,7 @@ static int get_number(void *obj, const char *name, const AVOption **o_out, doubl { const AVOption *o = av_opt_find(obj, name, NULL, 0, 0); void *dst; - if (!o || o->offset<=0) + if (!o) goto error; dst= ((uint8_t*)obj) + o->offset; |