comparison opt.c @ 7224:d5a52b28c9de libavcodec

Fix the av_set_string() free / alloc issue.

7223:0133a6c7480f

    if (c >= 'a' && c <= 'f') return c - 'a' + 10;
    if (c >= 'A' && c <= 'F') return c - 'A' + 10;
    return -1;
}

const AVOption *av_set_string(void *obj, const char *name, const char *val){
    const AVOption *o= av_find_opt(obj, name, NULL, 0, 0);
    if(o && o->offset==0 && o->type == FF_OPT_TYPE_CONST && o->unit){
        return set_all_opt(obj, o->unit, o->default_val);
    }
    if(!o || !val || o->offset<=0)

            notfirst=1;
        }
        return NULL;
    }

    memcpy(((uint8_t*)obj) + o->offset, &val, sizeof(val));
    return o;
}

const AVOption *av_set_double(void *obj, const char *name, double n){
    return av_set_number(obj, name, n, 1, 1);
}

7224:d5a52b28c9de

    if (c >= 'a' && c <= 'f') return c - 'a' + 10;
    if (c >= 'A' && c <= 'F') return c - 'A' + 10;
    return -1;
}

const AVOption *av_set_string2(void *obj, const char *name, const char *val, int alloc){
    const AVOption *o= av_find_opt(obj, name, NULL, 0, 0);
    if(o && o->offset==0 && o->type == FF_OPT_TYPE_CONST && o->unit){
        return set_all_opt(obj, o->unit, o->default_val);
    }
    if(!o || !val || o->offset<=0)

            notfirst=1;
        }
        return NULL;
    }

    if(alloc){
        av_free((void*)(((uint8_t*)obj) + o->offset));
        val= av_strdup(val);
    }

    memcpy(((uint8_t*)obj) + o->offset, &val, sizeof(val));
    return o;
}

const AVOption *av_set_string(void *obj, const char *name, const char *val){
    return av_set_string2(obj, name, val, 0);
}

const AVOption *av_set_double(void *obj, const char *name, double n){
    return av_set_number(obj, name, n, 1, 1);
}