diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-11 14:50:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-11 15:01:45 +0200 |
| commit | f5f3684fb8d3881a6f90913417b2b5272df76e49 (patch) | |
| tree | 2cd82a73afe553baeed57683b861e6775ccebb6b /libavutil | |
| parent | 48d20b918c80a68e61f8bdedbf335ed4a00d6a32 (diff) | |
| parent | 885da7b08289321b88919e86d1574c8683a95a22 (diff) | |
| download | ffmpeg-f5f3684fb8d3881a6f90913417b2b5272df76e49.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavf: simplify is_intra_only() by using codec descriptors.
lavc: add an intra-only codec property.
lavc: add codec descriptors.
lavc: fix mixing CODEC_ID/AV_CODEC_ID in C++ code.
dict: move struct AVDictionary definition to dict.c
dict: add av_dict_count()
Conflicts:
doc/APIchanges
libavcodec/old_codec_ids.h
libavformat/utils.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/dict.c | 10 | ||||
| -rw-r--r-- | libavutil/dict.h | 8 | ||||
| -rw-r--r-- | libavutil/internal.h | 5 | ||||
| -rw-r--r-- | libavutil/version.h | 2 |
4 files changed, 19 insertions, 6 deletions
diff --git a/libavutil/dict.c b/libavutil/dict.c index 6177ddd335..6d2d8c8dec 100644 --- a/libavutil/dict.c +++ b/libavutil/dict.c @@ -23,6 +23,16 @@ #include "internal.h" #include "mem.h" +struct AVDictionary { + int count; + AVDictionaryEntry *elems; +}; + +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 54ecba0c2d..7f9924b128 100644 --- a/libavutil/dict.h +++ b/libavutil/dict.h @@ -93,6 +93,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/internal.h b/libavutil/internal.h index c56aca6d07..a966e18dc3 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -40,11 +40,6 @@ #include "cpu.h" #include "dict.h" -struct AVDictionary { - int count; - AVDictionaryEntry *elems; -}; - #ifndef attribute_align_arg #if ARCH_X86_32 && AV_GCC_VERSION_AT_LEAST(4,2) # define attribute_align_arg __attribute__((force_align_arg_pointer)) diff --git a/libavutil/version.h b/libavutil/version.h index ebc782d77f..6b3e4860e1 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -39,7 +39,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 51 -#define LIBAVUTIL_VERSION_MINOR 67 +#define LIBAVUTIL_VERSION_MINOR 68 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |