mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-15 03:34:56 +00:00
make the AVOption code work with strings instead of crash
Originally committed as revision 11140 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
1fe47470d1
commit
24cdc39e9d
@ -159,7 +159,7 @@ const AVOption *av_set_string(void *obj, const char *name, const char *val){
|
||||
return NULL;
|
||||
}
|
||||
|
||||
memcpy(((uint8_t*)obj) + o->offset, val, sizeof(val));
|
||||
memcpy(((uint8_t*)obj) + o->offset, &val, sizeof(val));
|
||||
return o;
|
||||
}
|
||||
|
||||
@ -192,7 +192,7 @@ const char *av_get_string(void *obj, const char *name, const AVOption **o_out, c
|
||||
if(o_out) *o_out= o;
|
||||
|
||||
if(o->type == FF_OPT_TYPE_STRING)
|
||||
return dst;
|
||||
return *(void**)dst;
|
||||
|
||||
switch(o->type){
|
||||
case FF_OPT_TYPE_FLAGS: snprintf(buf, buf_len, "0x%08X",*(int *)dst);break;
|
||||
|
Loading…
Reference in New Issue
Block a user