diff options
| author | Mans Rullgard <mans@mansr.com> | 2012-08-08 17:30:15 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2012-08-10 15:15:00 +0100 |
| commit | 987170cb9dd036d3372c8feac6074d13d1b84dd2 (patch) | |
| tree | e4d443be62fdf1319300a027423c777551a20cd9 /libavutil | |
| parent | 05c36e0e5fbf0b75dbbbd327ad2f6a62992f9262 (diff) | |
| download | ffmpeg-987170cb9dd036d3372c8feac6074d13d1b84dd2.tar.gz | |
dict: add av_dict_count()
This adds a function to retrieve the number of entries in a
dictionary and updates the places directly accessing what should
be an opaque struct to use this new function instead.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/dict.c | 5 | ||||
| -rw-r--r-- | libavutil/dict.h | 8 | ||||
| -rw-r--r-- | libavutil/version.h | 4 |
3 files changed, 15 insertions, 2 deletions
diff --git a/libavutil/dict.c b/libavutil/dict.c index cb5f7b160f..1344613fa9 100644 --- a/libavutil/dict.c +++ b/libavutil/dict.c @@ -23,6 +23,11 @@ #include "internal.h" #include "mem.h" +int av_dict_count(const AVDictionary *m) +{ + return m ? m->count : 0; +} + AVDictionaryEntry * av_dict_get(AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags) { diff --git a/libavutil/dict.h b/libavutil/dict.h index aa07626535..72d1e9d25b 100644 --- a/libavutil/dict.h +++ b/libavutil/dict.h @@ -87,6 +87,14 @@ AVDictionaryEntry * av_dict_get(AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags); /** + * Get number of entries in dictionary. + * + * @param m dictionary + * @return number of entries in dictionary + */ +int av_dict_count(const AVDictionary *m); + +/** * Set the given entry in *pm, overwriting an existing entry. * * @param pm pointer to a pointer to a dictionary struct. If *pm is NULL diff --git a/libavutil/version.h b/libavutil/version.h index bd60d3f282..de5731a5a5 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -37,8 +37,8 @@ */ #define LIBAVUTIL_VERSION_MAJOR 51 -#define LIBAVUTIL_VERSION_MINOR 37 -#define LIBAVUTIL_VERSION_MICRO 1 +#define LIBAVUTIL_VERSION_MINOR 38 +#define LIBAVUTIL_VERSION_MICRO 0 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ |