[FFmpeg-devel] [PATCH 14/26] avformat: remove FF_API_AVSTREAM_CLASS

[James Almer]

Signed-off-by: James Almer <jamrial at gmail.com>
---
 fftools/ffmpeg_mux_init.c   | 11 -----------
 libavformat/avformat.h      |  2 --
 libavformat/options.c       |  3 ---
 libavformat/version_major.h |  1 -
 4 files changed, 17 deletions(-)

diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c
index 9eea8639dc..4d4521f639 100644
--- a/fftools/ffmpeg_mux_init.c
+++ b/fftools/ffmpeg_mux_init.c
@@ -1709,18 +1709,7 @@ static int set_dispositions(Muxer *mux, const OptionsContext *o)
             if (!disp)
                 continue;
 
-#if LIBAVFORMAT_VERSION_MAJOR >= 60
             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)
                 goto finish;
         }
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index b40492703c..daa396e5a2 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -948,12 +948,10 @@ const char *av_disposition_to_string(int disposition);
  * sizeof(AVStream) must not be used outside libav*.
  */
 typedef struct AVStream {
-#if FF_API_AVSTREAM_CLASS
     /**
      * A class for @ref avoptions. Set on stream creation.
      */
     const AVClass *av_class;
-#endif
 
     int index;    /**< stream index in AVFormatContext */
     /**
diff --git a/libavformat/options.c b/libavformat/options.c
index 0079a06d9a..c7681122cd 100644
--- a/libavformat/options.c
+++ b/libavformat/options.c
@@ -257,10 +257,7 @@ AVStream *avformat_new_stream(AVFormatContext *s, const AVCodec *c)
         return NULL;
     st = &sti->pub;
 
-#if FF_API_AVSTREAM_CLASS
     st->av_class = &stream_class;
-#endif
-
     st->codecpar = avcodec_parameters_alloc();
     if (!st->codecpar)
         goto fail;
diff --git a/libavformat/version_major.h b/libavformat/version_major.h
index 057d1ac0fb..1db8e7600e 100644
--- a/libavformat/version_major.h
+++ b/libavformat/version_major.h
@@ -42,7 +42,6 @@
  *
  */
 #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_AVIODIRCONTEXT           (LIBAVFORMAT_VERSION_MAJOR < 60)
 
-- 
2.39.0