Signed-off-by: James Almer <jamr...@gmail.com>
---
libavformat/avformat.h | 3 ---
libavformat/version_major.h | 1 -
2 files changed, 4 deletions(-)
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 1d97d56ac5..b40492703c 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1352,9 +1352,6 @@ typedef struct AVFormatContext {
*/
#define AVFMT_FLAG_BITEXACT 0x0400
#define AVFMT_FLAG_SORT_DTS 0x10000 ///< try to interleave outputted
packets by dts (using this flag can slow demuxing down)
-#if FF_API_LAVF_PRIV_OPT
-#define AVFMT_FLAG_PRIV_OPT 0x20000 ///< Enable use of private options by
delaying codec open (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/version_major.h b/libavformat/version_major.h
index 86af3ee4a5..abc1699685 100644
--- a/libavformat/version_major.h
+++ b/libavformat/version_major.h
@@ -41,7 +41,6 @@
* at once through the bump. This improves the git bisect-ability of the
change.
*
*/
-#define FF_API_LAVF_PRIV_OPT (LIBAVFORMAT_VERSION_MAJOR < 60)
#define FF_API_COMPUTE_PKT_FIELDS2 (LIBAVFORMAT_VERSION_MAJOR < 60)
#define FF_API_AVIOCONTEXT_WRITTEN (LIBAVFORMAT_VERSION_MAJOR < 60)
#define FF_HLS_TS_OPTIONS (LIBAVFORMAT_VERSION_MAJOR < 60)
--
2.39.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
