diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-05 18:55:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-05 18:55:44 +0200 |
| commit | 151f88d507f18c0aae011f9e88f40c508c11640f (patch) | |
| tree | bc97245f85205bfb5417a1b1f2d3582691197bab | |
| parent | 27856b2fe9cdbcf48ad996647cb104667b373fa4 (diff) | |
| parent | d816e125fe1fa5c909b706d47904a4d6c1799996 (diff) | |
| download | ffmpeg-151f88d507f18c0aae011f9e88f40c508c11640f.tar.gz | |
Merge commit 'd816e125fe1fa5c909b706d47904a4d6c1799996'
* commit 'd816e125fe1fa5c909b706d47904a4d6c1799996':
dict: const correctness for av_dict_get() and av_dict_copy()
Conflicts:
libavutil/dict.c
libavutil/dict.h
See: e12a73246d8ce7d0fc4036522688934e26de4bb1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavutil/dict.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/dict.h b/libavutil/dict.h index cf77cf9a32..025d867993 100644 --- a/libavutil/dict.h +++ b/libavutil/dict.h @@ -99,8 +99,8 @@ typedef struct AVDictionary AVDictionary; * @param flags a collection of AV_DICT_* flags controlling how the entry is retrieved * @return found entry or NULL in case no matching entry was found in the dictionary */ -AVDictionaryEntry * -av_dict_get(FF_CONST_AVUTIL53 AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags); +AVDictionaryEntry *av_dict_get(FF_CONST_AVUTIL53 AVDictionary *m, const char *key, + const AVDictionaryEntry *prev, int flags); /** * Get number of entries in dictionary. |