virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

avutil/dict: delay addition of const from e12a73246d until next major ABI bump

Browse Source 
This unbreaks API

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-05-14 15:24:38 +02:00
parent acb6f3af4f
commit 3690393f68
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavutil/dict.c
View File

@ -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;

6
libavutil/dict.h
View File

@ -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