diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-28 23:47:22 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-29 00:09:52 -0300 |
| commit | ca2b7794234cccd6c4ae548c4bd2eac5c53b80f2 (patch) | |
| tree | 36569ce7e11047c0a504c0eeaf25e76aa9e23c9b /libavformat | |
| parent | 8b43039fe19cacb8e7e0950ae50851cb91fa34e4 (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')
| -rw-r--r-- | libavformat/avformat.h | 2 | ||||
| -rw-r--r-- | libavformat/options_table.h | 2 | ||||
| -rw-r--r-- | libavformat/tests/seek.c | 2 |
3 files changed, 2 insertions, 4 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. diff --git a/libavformat/options_table.h b/libavformat/options_table.h index 118086df66..b60d031f67 100644 --- a/libavformat/options_table.h +++ b/libavformat/options_table.h @@ -49,7 +49,7 @@ static const AVOption avformat_options[] = { {"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", "don't merge side data", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_KEEP_SIDE_DATA }, INT_MIN, INT_MAX, D, "fflags"}, +{"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"}, {"latm", "enable RTP MP4A-LATM payload", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_MP4A_LATM }, INT_MIN, INT_MAX, E, "fflags"}, diff --git a/libavformat/tests/seek.c b/libavformat/tests/seek.c index 5cf3a123e3..7ed56ba4ef 100644 --- a/libavformat/tests/seek.c +++ b/libavformat/tests/seek.c @@ -67,8 +67,6 @@ int main(int argc, char **argv) int frame_count = 1; int duration = 4; - ic->flags |= AVFMT_FLAG_KEEP_SIDE_DATA; - for(i=2; i<argc; i+=2){ if (!strcmp(argv[i], "-seekforw")){ seekfirst = atoi(argv[i+1]); |