RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avutil: remove FF_CONST_AVUTIL53, its no longer needed 

version is 54 already

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-11-24 02:10:45 +01:00
parent 8294f5042d
commit 5182a2a235
5 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavutil/dict.c
View File

@ -36,7 +36,7 @@ int av_dict_count(const AVDictionary *m)
return m ? m->count : 0;
}
AVDictionaryEntry *av_dict_get(FF_CONST_AVUTIL53 AVDictionary *m, const char *key,
AVDictionaryEntry *av_dict_get(const AVDictionary *m, const char *key,
const AVDictionaryEntry *prev, int flags)
{
unsigned int i, j;
@ -201,7 +201,7 @@ void av_dict_free(AVDictionary **pm)
av_freep(pm);
}
void av_dict_copy(AVDictionary **dst, FF_CONST_AVUTIL53 AVDictionary *src, int flags)
void av_dict_copy(AVDictionary **dst, const AVDictionary *src, int flags)
{
AVDictionaryEntry *t = NULL;

4
libavutil/dict.h
View File

@ -101,7 +101,7 @@ 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,
AVDictionaryEntry *av_dict_get(const AVDictionary *m, const char *key,
const AVDictionaryEntry *prev, int flags);
/**
@ -163,7 +163,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, FF_CONST_AVUTIL53 AVDictionary *src, int flags);
void av_dict_copy(AVDictionary **dst, const AVDictionary *src, int flags);
/**
* Free all the memory allocated for an AVDictionary struct

4
libavutil/fifo.c
View File

@ -74,12 +74,12 @@ void av_fifo_reset(AVFifoBuffer *f)
f->wndx = f->rndx = 0;
}
int av_fifo_size(FF_CONST_AVUTIL53 AVFifoBuffer *f)
int av_fifo_size(const AVFifoBuffer *f)
{
return (uint32_t)(f->wndx - f->rndx);
}
int av_fifo_space(FF_CONST_AVUTIL53 AVFifoBuffer *f)
int av_fifo_space(const AVFifoBuffer *f)
{
return f->end - f->buffer - av_fifo_size(f);
}

4
libavutil/fifo.h
View File

@ -73,7 +73,7 @@ void av_fifo_reset(AVFifoBuffer *f);
* @param f AVFifoBuffer to read from
* @return size
*/
int av_fifo_size(FF_CONST_AVUTIL53 AVFifoBuffer *f);
int av_fifo_size(const AVFifoBuffer *f);
/**
* Return the amount of space in bytes in the AVFifoBuffer, that is the
@ -81,7 +81,7 @@ int av_fifo_size(FF_CONST_AVUTIL53 AVFifoBuffer *f);
* @param f AVFifoBuffer to write into
* @return size
*/
int av_fifo_space(FF_CONST_AVUTIL53 AVFifoBuffer *f);
int av_fifo_space(const AVFifoBuffer *f);
/**
* Feed data from an AVFifoBuffer to a user-supplied callback.

8
libavutil/version.h
View File

@ -121,14 +121,6 @@
#endif
#ifndef FF_CONST_AVUTIL53
#if LIBAVUTIL_VERSION_MAJOR >= 53
#define FF_CONST_AVUTIL53 const
#else
#define FF_CONST_AVUTIL53
#endif
#endif
/**
* @}
*/