virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

avformat: remove FF_API_AVSTREAM_CLASS

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2023-01-11 10:31:11 -03:00 committed by Anton Khirnov
parent 1f86fc1c5e
commit 6d6ae3595b
4 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fftools/ffmpeg_mux_init.c
View File

@ -2000,18 +2000,7 @@ static int set_dispositions(Muxer *mux, const OptionsContext *o)
if (!disp) if (!disp)
continue; continue;
#if LIBAVFORMAT_VERSION_MAJOR >= 60
ret = av_opt_set(ost->st, "disposition", disp, 0); ret = av_opt_set(ost->st, "disposition", disp, 0);
#else
{
const AVClass *class = av_stream_get_class();
const AVOption *o = av_opt_find(&class, "disposition", NULL, 0, AV_OPT_SEARCH_FAKE_OBJ);
av_assert0(o);
ret = av_opt_eval_flags(&class, o, disp, &ost->st->disposition);
}
#endif
if (ret < 0) if (ret < 0)
goto finish; goto finish;
} }

2
libavformat/avformat.h
View File

@ -838,12 +838,10 @@ const char *av_disposition_to_string(int disposition);
* sizeof(AVStream) must not be used outside libav*. * sizeof(AVStream) must not be used outside libav*.
*/ */
typedef struct AVStream { typedef struct AVStream {
#if FF_API_AVSTREAM_CLASS
/** /**
* A class for @ref avoptions. Set on stream creation. * A class for @ref avoptions. Set on stream creation.
*/ */
const AVClass *av_class; const AVClass *av_class;
#endif
int index; /**< stream index in AVFormatContext */ int index; /**< stream index in AVFormatContext */
/** /**

3
libavformat/options.c
View File

@ -257,10 +257,7 @@ AVStream *avformat_new_stream(AVFormatContext *s, const AVCodec *c)
return NULL; return NULL;
st = &sti->pub; st = &sti->pub;
#if FF_API_AVSTREAM_CLASS
st->av_class = &stream_class; st->av_class = &stream_class;
#endif
st->codecpar = avcodec_parameters_alloc(); st->codecpar = avcodec_parameters_alloc();
if (!st->codecpar) if (!st->codecpar)
goto fail; goto fail;

1
libavformat/version_major.h
View File

@ -42,7 +42,6 @@
* *
*/ */
#define FF_API_COMPUTE_PKT_FIELDS2 (LIBAVFORMAT_VERSION_MAJOR < 60) #define FF_API_COMPUTE_PKT_FIELDS2 (LIBAVFORMAT_VERSION_MAJOR < 60)
#define FF_API_AVSTREAM_CLASS (LIBAVFORMAT_VERSION_MAJOR > 59)
#define FF_API_GET_END_PTS (LIBAVFORMAT_VERSION_MAJOR < 60) #define FF_API_GET_END_PTS (LIBAVFORMAT_VERSION_MAJOR < 60)
#define FF_API_AVIODIRCONTEXT (LIBAVFORMAT_VERSION_MAJOR < 60) #define FF_API_AVIODIRCONTEXT (LIBAVFORMAT_VERSION_MAJOR < 60)