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/options_table.h | |
parent | 8b43039fe19cacb8e7e0950ae50851cb91fa34e4 (diff) | |
download | ffmpeg-ca2b7794234cccd6c4ae548c4bd2eac5c53b80f2.tar.gz |
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/options_table.h')
-rw-r--r-- | libavformat/options_table.h | 2 |
1 files changed, 1 insertions, 1 deletions
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"}, |