[FFmpeg-cvslog] avutil: remove FF_CONST_AVUTIL53, its no longer needed

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov 24 02:10:45 2014 +0100| [5182a2a235c3840e0ea0b5f3e352dc28646a11ed] | committer: Michael Niedermayer

avutil: remove FF_CONST_AVUTIL53, its no longer needed

version is 54 already

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5182a2a235c3840e0ea0b5f3e352dc28646a11ed
---

 libavutil/dict.c    |    4 ++--
 libavutil/dict.h    |    4 ++--
 libavutil/fifo.c    |    4 ++--
 libavutil/fifo.h    |    4 ++--
 libavutil/version.h |    8 --------
 5 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/libavutil/dict.c b/libavutil/dict.c
index 65b330f..2983ea5 100644
--- a/libavutil/dict.c
+++ b/libavutil/dict.c
@@ -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;
 
diff --git a/libavutil/dict.h b/libavutil/dict.h
index 34fe53a..f2df687 100644
--- a/libavutil/dict.h
+++ b/libavutil/dict.h
@@ -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
diff --git a/libavutil/fifo.c b/libavutil/fifo.c
index 77391ee..4ff3194 100644
--- a/libavutil/fifo.c
+++ b/libavutil/fifo.c
@@ -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);
 }
diff --git a/libavutil/fifo.h b/libavutil/fifo.h
index dda7dd2..f3bdcbc 100644
--- a/libavutil/fifo.h
+++ b/libavutil/fifo.h
@@ -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.
diff --git a/libavutil/version.h b/libavutil/version.h
index e8f9655..8b357de 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -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
-
 /**
  * @}
  */