virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-05-13 21:26:33 +02:00
Code Issues Releases Activity

Merge commit 'd816e125fe1fa5c909b706d47904a4d6c1799996'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer 2014-06-05 18:55:44 +02:00
commit 151f88d507
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavutil/dict.h
View File

@ -99,8 +99,8 @@ typedef struct AVDictionary AVDictionary;
* @param flags a collection of AV_DICT_* flags controlling how the entry is retrieved * @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 * @return found entry or NULL in case no matching entry was found in the dictionary
*/ */
AVDictionaryEntry * AVDictionaryEntry *av_dict_get(FF_CONST_AVUTIL53 AVDictionary *m, const char *key,
av_dict_get(FF_CONST_AVUTIL53 AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags); const AVDictionaryEntry *prev, int flags);
/** /**
* Get number of entries in dictionary. * Get number of entries in dictionary.