[SCM] libav/experimental: dict: const correctness for av_dict_get() and av_dict_copy()

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit d816e125fe1fa5c909b706d47904a4d6c1799996
Author: Diego Biurrun <diego at biurrun.de>
Date:   Wed Jun 4 04:58:33 2014 -0700

    dict: const correctness for av_dict_get() and av_dict_copy()

diff --git a/libavutil/dict.c b/libavutil/dict.c
index 3b95aba..7b4dbf2 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(AVDictionary *m, const char *key,
+AVDictionaryEntry *av_dict_get(const AVDictionary *m, const char *key,
                                const AVDictionaryEntry *prev, int flags)
 {
     unsigned int i, j;
@@ -178,7 +178,7 @@ void av_dict_free(AVDictionary **pm)
     av_freep(pm);
 }
 
-void av_dict_copy(AVDictionary **dst, AVDictionary *src, int flags)
+void av_dict_copy(AVDictionary **dst, const AVDictionary *src, int flags)
 {
     AVDictionaryEntry *t = NULL;
 
diff --git a/libavutil/dict.h b/libavutil/dict.h
index e0a91ae..e4aee27 100644
--- a/libavutil/dict.h
+++ b/libavutil/dict.h
@@ -83,8 +83,8 @@ typedef struct AVDictionary AVDictionary;
  * @param flags Allows case as well as suffix-insensitive comparisons.
  * @return Found entry or NULL, changing key or value leads to undefined behavior.
  */
-AVDictionaryEntry *
-av_dict_get(AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags);
+AVDictionaryEntry *av_dict_get(const AVDictionary *m, const char *key,
+                               const AVDictionaryEntry *prev, int flags);
 
 /**
  * Get number of entries in dictionary.
@@ -131,7 +131,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, AVDictionary *src, int flags);
+void av_dict_copy(AVDictionary **dst, const AVDictionary *src, int flags);
 
 /**
  * Free all the memory allocated for an AVDictionary struct

-- 
Libav/FFmpeg packaging