diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-14 14:01:11 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-14 14:01:11 +0200 |
| commit | b994788353ec39677d9f751da5cf754ef6247773 (patch) | |
| tree | 9bb1153a5bb5680fc5bc7d1385d832ee70266026 /libavutil | |
| parent | fcfb66ba9b6e8e8026fa38ea99e0458b31321217 (diff) | |
| parent | 11c5f438ff83da5040e85bfa6299f56b321d32ef (diff) | |
| download | ffmpeg-b994788353ec39677d9f751da5cf754ef6247773.tar.gz | |
Merge commit '11c5f438ff83da5040e85bfa6299f56b321d32ef'
* commit '11c5f438ff83da5040e85bfa6299f56b321d32ef':
dict: Change return type of av_dict_copy()
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/dict.c | 11 | ||||
| -rw-r--r-- | libavutil/dict.h | 4 | ||||
| -rw-r--r-- | libavutil/version.h | 2 |
3 files changed, 12 insertions, 5 deletions
diff --git a/libavutil/dict.c b/libavutil/dict.c index 6ff1af5215..8bb65a13fe 100644 --- a/libavutil/dict.c +++ b/libavutil/dict.c @@ -210,12 +210,17 @@ void av_dict_free(AVDictionary **pm) av_freep(pm); } -void av_dict_copy(AVDictionary **dst, const AVDictionary *src, int flags) +int av_dict_copy(AVDictionary **dst, const AVDictionary *src, int flags) { AVDictionaryEntry *t = NULL; - while ((t = av_dict_get(src, "", t, AV_DICT_IGNORE_SUFFIX))) - av_dict_set(dst, t->key, t->value, flags); + while ((t = av_dict_get(src, "", t, AV_DICT_IGNORE_SUFFIX))) { + int ret = av_dict_set(dst, t->key, t->value, flags); + if (ret < 0) + return ret; + } + + return 0; } int av_dict_get_string(const AVDictionary *m, char **buffer, diff --git a/libavutil/dict.h b/libavutil/dict.h index f2df687c03..5b8d003396 100644 --- a/libavutil/dict.h +++ b/libavutil/dict.h @@ -162,8 +162,10 @@ int av_dict_parse_string(AVDictionary **pm, const char *str, * @param src pointer to source AVDictionary struct * @param flags flags to use when setting entries in *dst * @note metadata is read using the AV_DICT_IGNORE_SUFFIX flag + * @return 0 on success, negative AVERROR code on failure. If dst was allocated + * by this function, callers should free the associated memory. */ -void av_dict_copy(AVDictionary **dst, const AVDictionary *src, int flags); +int av_dict_copy(AVDictionary **dst, const AVDictionary *src, int flags); /** * Free all the memory allocated for an AVDictionary struct diff --git a/libavutil/version.h b/libavutil/version.h index e39034dfc4..827f17829e 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -56,7 +56,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 55 -#define LIBAVUTIL_VERSION_MINOR 3 +#define LIBAVUTIL_VERSION_MINOR 4 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |