Commit b89081e0 authored by James Almer's avatar James Almer

avformat: remove dead av_stream_get_side_data() cruft

Signed-off-by: 's avatarJames Almer <jamrial@gmail.com>
parent ca4df37f
...@@ -2082,13 +2082,8 @@ uint8_t *av_stream_new_side_data(AVStream *stream, ...@@ -2082,13 +2082,8 @@ uint8_t *av_stream_new_side_data(AVStream *stream,
* @param size pointer for side information size to store (optional) * @param size pointer for side information size to store (optional)
* @return pointer to data if present or NULL otherwise * @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, uint8_t *av_stream_get_side_data(const AVStream *stream,
enum AVPacketSideDataType type, int *size); enum AVPacketSideDataType type, int *size);
#endif
AVProgram *av_new_program(AVFormatContext *s, int id); AVProgram *av_new_program(AVFormatContext *s, int id);
......
...@@ -5244,13 +5244,8 @@ int ff_generate_avci_extradata(AVStream *st) ...@@ -5244,13 +5244,8 @@ int ff_generate_avci_extradata(AVStream *st)
return 0; 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, uint8_t *av_stream_get_side_data(const AVStream *st,
enum AVPacketSideDataType type, int *size) enum AVPacketSideDataType type, int *size)
#endif
{ {
int i; int i;
......
...@@ -67,9 +67,6 @@ ...@@ -67,9 +67,6 @@
#ifndef FF_API_LAVF_AVCTX #ifndef FF_API_LAVF_AVCTX
#define FF_API_LAVF_AVCTX (LIBAVFORMAT_VERSION_MAJOR < 59) #define FF_API_LAVF_AVCTX (LIBAVFORMAT_VERSION_MAJOR < 59)
#endif #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 #ifndef FF_API_HTTP_USER_AGENT
#define FF_API_HTTP_USER_AGENT (LIBAVFORMAT_VERSION_MAJOR < 59) #define FF_API_HTTP_USER_AGENT (LIBAVFORMAT_VERSION_MAJOR < 59)
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment