RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-12 18:25:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '564b4591bbe223bdc5f36a1131eaef103f23f5d0'

Browse Source 
* commit '564b4591bbe223bdc5f36a1131eaef103f23f5d0':
  opt: Add av_opt_copy()

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2016-04-19 19:17:50 +01:00
commit e344646c80
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavutil/opt.c
View File

@ -1587,7 +1587,7 @@ static int opt_size(enum AVOptionType type)
case AV_OPT_TYPE_SAMPLE_FMT:return sizeof(enum AVSampleFormat); case AV_OPT_TYPE_SAMPLE_FMT:return sizeof(enum AVSampleFormat);
case AV_OPT_TYPE_COLOR: return 4; case AV_OPT_TYPE_COLOR: return 4;
} }
return 0; return AVERROR(EINVAL);
} }
int av_opt_copy(void *dst, const void *src) int av_opt_copy(void *dst, const void *src)
@ -1597,10 +1597,10 @@ int av_opt_copy(void *dst, const void *src)
int ret = 0; int ret = 0;
if (!src) if (!src)
return 0; return AVERROR(EINVAL);
c = *(AVClass**)src; c = *(AVClass**)src;
if (*(AVClass**)dst && c != *(AVClass**)dst) if (!c || c != *(AVClass**)dst)
return AVERROR(EINVAL); return AVERROR(EINVAL);
while ((o = av_opt_next(src, o))) { while ((o = av_opt_next(src, o))) {
@ -1637,7 +1637,11 @@ int av_opt_copy(void *dst, const void *src)
if (av_dict_count(*sdict) != av_dict_count(*ddict)) if (av_dict_count(*sdict) != av_dict_count(*ddict))
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
} else { } else {
memcpy(field_dst, field_src, opt_size(o->type)); int size = opt_size(o->type);
if (size < 0)
ret = size;
else
memcpy(field_dst, field_src, size);
} }
} }
return ret; return ret;

2
libavutil/version.h
View File

@ -65,7 +65,7 @@
#define LIBAVUTIL_VERSION_MAJOR 55 #define LIBAVUTIL_VERSION_MAJOR 55
#define LIBAVUTIL_VERSION_MINOR 22 #define LIBAVUTIL_VERSION_MINOR 22
#define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_MICRO 101
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
LIBAVUTIL_VERSION_MINOR, \ LIBAVUTIL_VERSION_MINOR, \