virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avutil/opt: factor set_string_image_size() out

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-12-07 13:01:38 +01:00
parent 7f763775aa
commit 9648c4fe9c
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
libavutil/opt.c
View File

@@ -252,6 +252,21 @@ static int set_string_number(void *obj, void *target_obj, const AVOption *o, con
return 0; return 0;
} }
static int set_string_image_size(void *obj, const AVOption *o, const char *val, int *dst)
{
int ret;
if (!val || !strcmp(val, "none")) {
dst[0] =
dst[1] = 0;
return 0;
}
ret = av_parse_video_size(dst, dst + 1, val);
if (ret < 0)
av_log(obj, AV_LOG_ERROR, "Unable to parse option value \"%s\" as image size\n", val);
return ret;
}
#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)
{ {
@@ -286,15 +301,7 @@ int av_opt_set(void *obj, const char *name, const char *val, int search_flags)
case AV_OPT_TYPE_FLOAT: case AV_OPT_TYPE_FLOAT:
case AV_OPT_TYPE_DOUBLE: case AV_OPT_TYPE_DOUBLE:
case AV_OPT_TYPE_RATIONAL: return set_string_number(obj, target_obj, o, val, dst); case AV_OPT_TYPE_RATIONAL: return set_string_number(obj, target_obj, o, val, dst);
case AV_OPT_TYPE_IMAGE_SIZE: case AV_OPT_TYPE_IMAGE_SIZE: return set_string_image_size(obj, o, val, dst);
if (!val || !strcmp(val, "none")) {
*(int *)dst = *((int *)dst + 1) = 0;
return 0;
}
ret = av_parse_video_size(dst, ((int *)dst) + 1, val);
if (ret < 0)
av_log(obj, AV_LOG_ERROR, "Unable to parse option value \"%s\" as image size\n", val);
return ret;
case AV_OPT_TYPE_VIDEO_RATE: case AV_OPT_TYPE_VIDEO_RATE:
if (!val) { if (!val) {
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);