From a3439de8742aa64650de6aacf65d853b4a8aafed Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Sat, 6 Mar 2021 15:59:06 +0100 Subject: [PATCH] avformat: Remove remnants of side data merging Deprecated in d682ae70b4b3a53fb73ec30281f9f4cfbc531edd, ineffective since ca4df37f06f8a47651c67693b4851ed8d7e3ef74. Signed-off-by: Andreas Rheinhardt Signed-off-by: James Almer --- doc/formats.texi | 1 - libavformat/avformat.h | 3 --- libavformat/options_table.h | 3 --- libavformat/version.h | 3 --- 4 files changed, 10 deletions(-) diff --git a/doc/formats.texi b/doc/formats.texi index fc80ce1d2b4..9387f98b6ac 100644 --- a/doc/formats.texi +++ b/doc/formats.texi @@ -49,7 +49,6 @@ Generate missing PTS if DTS is present. Ignore DTS if PTS is set. Inert when nofillin is set. @item ignidx Ignore index. -@item keepside (@emph{deprecated},@emph{inert}) @item nobuffer Reduce the latency introduced by buffering during initial input streams analysis. @item nofillin diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 093084221ad..6c12621bbb1 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1281,9 +1281,6 @@ typedef struct AVFormatContext { #if FF_API_LAVF_PRIV_OPT #define AVFMT_FLAG_PRIV_OPT 0x20000 ///< Enable use of private options by delaying codec open (deprecated, will do nothing once av_demuxer_open() is removed) #endif -#if FF_API_LAVF_KEEPSIDE_FLAG -#define AVFMT_FLAG_KEEP_SIDE_DATA 0x40000 ///< Deprecated, does nothing. -#endif #define AVFMT_FLAG_FAST_SEEK 0x80000 ///< Enable fast, but inaccurate seeks for some formats #define AVFMT_FLAG_SHORTEST 0x100000 ///< Stop muxing when the shortest stream stops. #define AVFMT_FLAG_AUTO_BSF 0x200000 ///< Add bitstream filters as requested by the muxer diff --git a/libavformat/options_table.h b/libavformat/options_table.h index b4141564c84..d041ffb6418 100644 --- a/libavformat/options_table.h +++ b/libavformat/options_table.h @@ -48,9 +48,6 @@ static const AVOption avformat_options[] = { {"igndts", "ignore dts", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_IGNDTS }, INT_MIN, INT_MAX, D, "fflags"}, {"discardcorrupt", "discard corrupted frames", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_DISCARD_CORRUPT }, INT_MIN, INT_MAX, D, "fflags"}, {"sortdts", "try to interleave outputted packets by dts", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_SORT_DTS }, INT_MIN, INT_MAX, D, "fflags"}, -#if FF_API_LAVF_KEEPSIDE_FLAG -{"keepside", "deprecated, does nothing", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_KEEP_SIDE_DATA }, INT_MIN, INT_MAX, D, "fflags"}, -#endif {"fastseek", "fast but inaccurate seeks", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_FAST_SEEK }, INT_MIN, INT_MAX, D, "fflags"}, #if FF_API_LAVF_MP4A_LATM {"latm", "deprecated, does nothing", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_MP4A_LATM }, INT_MIN, INT_MAX, E, "fflags"}, diff --git a/libavformat/version.h b/libavformat/version.h index a97a2715e47..661d687f870 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -58,9 +58,6 @@ #ifndef FF_API_LAVF_AVCTX #define FF_API_LAVF_AVCTX (LIBAVFORMAT_VERSION_MAJOR < 59) #endif -#ifndef FF_API_LAVF_KEEPSIDE_FLAG -#define FF_API_LAVF_KEEPSIDE_FLAG (LIBAVFORMAT_VERSION_MAJOR < 59) -#endif #ifndef FF_API_OLD_ROTATE_API #define FF_API_OLD_ROTATE_API (LIBAVFORMAT_VERSION_MAJOR < 59) #endif -- 2.39.2