diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-03-06 15:59:06 +0100 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2021-04-27 10:43:09 -0300 |
| commit | a3439de8742aa64650de6aacf65d853b4a8aafed (patch) | |
| tree | 02faa51e0c8a7be8d2add0cdbf67cfe4039e042b /libavformat/avformat.h | |
| parent | 2086d635c36c2865d1a0145c56e448b30af59ba0 (diff) | |
avformat: Remove remnants of side data merging
Deprecated in d682ae70b4b3a53fb73ec30281f9f4cfbc531edd,
ineffective since ca4df37f06f8a47651c67693b4851ed8d7e3ef74.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/avformat.h')
| -rw-r--r-- | libavformat/avformat.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 093084221a..6c12621bbb 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 |