[FFmpeg-cvslog] avformat: remove dead av_stream_get_side_data() cruft

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sun Oct 22 01:36:28 2017 -0300| [b89081e01be76fc6166131fb082151041b1a56b5] | committer: James Almer

avformat: remove dead av_stream_get_side_data() cruft

Signed-off-by: James Almer <jamrial at gmail.com>

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

 libavformat/avformat.h | 5 -----
 libavformat/utils.c    | 5 -----
 libavformat/version.h  | 3 ---
 3 files changed, 13 deletions(-)

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 870409061f..ece1b179f3 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -2082,13 +2082,8 @@ uint8_t *av_stream_new_side_data(AVStream *stream,
  * @param size pointer for side information size to store (optional)
  * @return pointer to data if present or NULL otherwise
  */
-#if FF_API_NOCONST_GET_SIDE_DATA
-uint8_t *av_stream_get_side_data(AVStream *stream,
-                                 enum AVPacketSideDataType type, int *size);
-#else
 uint8_t *av_stream_get_side_data(const AVStream *stream,
                                  enum AVPacketSideDataType type, int *size);
-#endif
 
 AVProgram *av_new_program(AVFormatContext *s, int id);
 
diff --git a/libavformat/utils.c b/libavformat/utils.c
index d89dd56357..6dbc48d54d 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -5244,13 +5244,8 @@ int ff_generate_avci_extradata(AVStream *st)
     return 0;
 }
 
-#if FF_API_NOCONST_GET_SIDE_DATA
-uint8_t *av_stream_get_side_data(AVStream *st,
-                                 enum AVPacketSideDataType type, int *size)
-#else
 uint8_t *av_stream_get_side_data(const AVStream *st,
                                  enum AVPacketSideDataType type, int *size)
-#endif
 {
     int i;
 
diff --git a/libavformat/version.h b/libavformat/version.h
index 3bb1e489cf..0feb788c36 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -67,9 +67,6 @@
 #ifndef FF_API_LAVF_AVCTX
 #define FF_API_LAVF_AVCTX               (LIBAVFORMAT_VERSION_MAJOR < 59)
 #endif
-#ifndef FF_API_NOCONST_GET_SIDE_DATA
-#define FF_API_NOCONST_GET_SIDE_DATA    (LIBAVFORMAT_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_HTTP_USER_AGENT
 #define FF_API_HTTP_USER_AGENT          (LIBAVFORMAT_VERSION_MAJOR < 59)
 #endif