diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-14 15:24:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-14 15:44:01 +0200 |
| commit | 3690393f681d2b4f99a10085715e879629c9854c (patch) | |
| tree | 1489bf5de5feedcd6f6b28f3bb6f503f81ea8f75 | |
| parent | acb6f3af4fce240957b79a1e58cb0eb60db74ba6 (diff) | |
| download | ffmpeg-3690393f681d2b4f99a10085715e879629c9854c.tar.gz | |
avutil/dict: delay addition of const from e12a73246d8ce7d0fc4036522688934e26de4bb1 until next major ABI bump
This unbreaks API
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavutil/dict.c | 4 | ||||
| -rw-r--r-- | libavutil/dict.h | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/libavutil/dict.c b/libavutil/dict.c index 003afd74fc..f7aa7094ad 100644 --- a/libavutil/dict.c +++ b/libavutil/dict.c @@ -35,7 +35,7 @@ int av_dict_count(const AVDictionary *m) return m ? m->count : 0; } -AVDictionaryEntry *av_dict_get(const AVDictionary *m, const char *key, +AVDictionaryEntry *av_dict_get(FF_CONST_AVUTIL53 AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags) { unsigned int i, j; @@ -181,7 +181,7 @@ void av_dict_free(AVDictionary **pm) av_freep(pm); } -void av_dict_copy(AVDictionary **dst, const AVDictionary *src, int flags) +void av_dict_copy(AVDictionary **dst, FF_CONST_AVUTIL53 AVDictionary *src, int flags) { AVDictionaryEntry *t = NULL; diff --git a/libavutil/dict.h b/libavutil/dict.h index a39a5ee0d4..cf77cf9a32 100644 --- a/libavutil/dict.h +++ b/libavutil/dict.h @@ -31,6 +31,8 @@ #ifndef AVUTIL_DICT_H #define AVUTIL_DICT_H +#include "version.h" + /** * @addtogroup lavu_dict AVDictionary * @ingroup lavu_data @@ -98,7 +100,7 @@ typedef struct AVDictionary AVDictionary; * @return found entry or NULL in case no matching entry was found in the dictionary */ AVDictionaryEntry * -av_dict_get(const AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags); +av_dict_get(FF_CONST_AVUTIL53 AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags); /** * Get number of entries in dictionary. @@ -148,7 +150,7 @@ int av_dict_parse_string(AVDictionary **pm, const char *str, * @param flags flags to use when setting entries in *dst * @note metadata is read using the AV_DICT_IGNORE_SUFFIX flag */ -void av_dict_copy(AVDictionary **dst, const AVDictionary *src, int flags); +void av_dict_copy(AVDictionary **dst, FF_CONST_AVUTIL53 AVDictionary *src, int flags); /** * Free all the memory allocated for an AVDictionary struct |