summaryrefslogtreecommitdiff
path: root/libavformat/options_table.h
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2021-03-06 15:59:06 +0100
committerJames Almer <jamrial@gmail.com>2021-04-27 10:43:09 -0300
commita3439de8742aa64650de6aacf65d853b4a8aafed (patch)
tree02faa51e0c8a7be8d2add0cdbf67cfe4039e042b /libavformat/options_table.h
parent2086d635c36c2865d1a0145c56e448b30af59ba0 (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/options_table.h')
-rw-r--r--libavformat/options_table.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/libavformat/options_table.h b/libavformat/options_table.h
index b4141564c8..d041ffb641 100644
--- a/libavformat/options_table.h
+++ b/libavformat/options_table.h
@@ -48,9 +48,6 @@ static const AVOption avformat_options[] = {
{"igndts", "ignore dts", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_IGNDTS }, INT_MIN, INT_MAX, D, "fflags"},
{"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", "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"},
#if FF_API_LAVF_MP4A_LATM
{"latm", "deprecated, does nothing", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_MP4A_LATM }, INT_MIN, INT_MAX, E, "fflags"},