Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-10-29 05:47:22 +0300
committerJames Almer <jamrial@gmail.com>2017-10-29 06:09:52 +0300
commitca2b7794234cccd6c4ae548c4bd2eac5c53b80f2 (patch)
tree36569ce7e11047c0a504c0eeaf25e76aa9e23c9b /libavformat/avformat.h
parent8b43039fe19cacb8e7e0950ae50851cb91fa34e4 (diff)
avformat: remove use of deprecated AVFMT_FLAG_KEEP_SIDE_DATA flag
It has no effect whatsoever since the major bump. Replace the flag's documentation to reflect this as well. Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/avformat.h')
-rw-r--r--libavformat/avformat.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 65fc9eac0c..edb0c601f9 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1444,7 +1444,7 @@ typedef struct AVFormatContext {
#define AVFMT_FLAG_SORT_DTS 0x10000 ///< try to interleave outputted packets by dts (using this flag can slow demuxing down)
#define AVFMT_FLAG_PRIV_OPT 0x20000 ///< Enable use of private options by delaying codec open (this could be made default once all code is converted)
#if FF_API_LAVF_KEEPSIDE_FLAG
-#define AVFMT_FLAG_KEEP_SIDE_DATA 0x40000 ///< Don't merge side data but keep it separate. Deprecated, will be the default.
+#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.