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/dict.c | |
| 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/dict.c')
| -rw-r--r-- | libavutil/dict.c | 10 |
1 files changed, 10 insertions, 0 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) { |