Merge commit '8c616b3b8996bd4f9b117496b66b16cc625d7d24'

[ffmpeg] / libavformat / utils.c

diff --git a/libavformat/utils.c b/libavformat/utils.c
index d89dd563572c134945a7f6d653aa602d6dc1d0b0..6dbc48d54d73746195ebbdaf59b64ab8dbc22ca4 100644 (file)
--- 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;