virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-28 12:32:17 +02:00
Code Issues Releases Activity

avutil/opt: factor set_string_color() out

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-12-07 13:09:33 +01:00
parent 758d4e4067
commit 0aedf90e62
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libavutil/opt.c
View File

@ -280,6 +280,21 @@ static int set_string_video_rate(void *obj, const AVOption *o, const char *val,
return ret; return ret;
} }
static int set_string_color(void *obj, const AVOption *o, const char *val, uint8_t *dst)
{
int ret;
if (!val) {
return 0;
} else {
ret = av_parse_color(dst, val, -1, obj);
if (ret < 0)
av_log(obj, AV_LOG_ERROR, "Unable to parse option value \"%s\" as color\n", val);
return ret;
}
return 0;
}
#if FF_API_OLD_AVOPTIONS #if FF_API_OLD_AVOPTIONS
int av_set_string3(void *obj, const char *name, const char *val, int alloc, const AVOption **o_out) int av_set_string3(void *obj, const char *name, const char *val, int alloc, const AVOption **o_out)
{ {
@ -358,16 +373,7 @@ int av_opt_set(void *obj, const char *name, const char *val, int search_flags)
return ret; return ret;
} }
break; break;
case AV_OPT_TYPE_COLOR: case AV_OPT_TYPE_COLOR: return set_string_color(obj, o, val, dst);
if (!val) {
return 0;
} else {
ret = av_parse_color(dst, val, -1, obj);
if (ret < 0)
av_log(obj, AV_LOG_ERROR, "Unable to parse option value \"%s\" as color\n", val);
return ret;
}
break;
case AV_OPT_TYPE_CHANNEL_LAYOUT: case AV_OPT_TYPE_CHANNEL_LAYOUT:
if (!val || !strcmp(val, "none")) { if (!val || !strcmp(val, "none")) {
*(int64_t *)dst = 0; *(int64_t *)dst = 0;