virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

AVOptions: remove AVOption.offset <= 0 checks

Browse Source 
They will only ever be <=0 if the option is broken, in which case this
check is hiding a bug.
This commit is contained in:
Anton Khirnov 2011-09-05 21:44:33 +02:00
parent 79eff91325
commit 4dbcdfa86d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavutil/opt.c
View File

@ -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;