summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2018-05-24 19:33:25 +0200
committerJan Ekström <jeebjp@gmail.com>2018-05-31 01:24:51 +0300
commit31bce1cbe78b3d61e44ea9c5a6a17c1fe1723063 (patch)
tree15653556ee78c7135a737ef174571a7bb39869b6
parentca97239cb6f3ff08d1e9be384352e2a9bd8694e1 (diff)
downloadmpv-31bce1cbe78b3d61e44ea9c5a6a17c1fe1723063.tar.bz2
mpv-31bce1cbe78b3d61e44ea9c5a6a17c1fe1723063.tar.xz
demux_lavf: drop obscure genpts option
This code shouldn't even exist in libavformat. If you still need it, you can enable it via --demuxer-lavf-o.
-rw-r--r--DOCS/man/options.rst6
-rw-r--r--demux/demux_lavf.c5
2 files changed, 0 insertions, 11 deletions
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index b10c2a2b23..7162e6ecf0 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -2763,12 +2763,6 @@ Demuxer
imperfect behavior from libavformat demuxers. Passing ``no`` disables
these. For debugging and testing only.
-``--demuxer-lavf-genpts-mode=<no|lavf>``
- Mode for deriving missing packet PTS values from packet DTS. ``lavf``
- enables libavformat's ``genpts`` option. ``no`` disables it. This used
- to be enabled by default, but then it was deemed as not needed anymore.
- Enabling this might help with timestamp problems, or make them worse.
-
``--demuxer-lavf-o=<key>=<value>[,<key>=<value>[,...]]``
Pass AVOptions to libavformat demuxer.
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c
index 60ae878398..83cce14bc2 100644
--- a/demux/demux_lavf.c
+++ b/demux/demux_lavf.c
@@ -76,7 +76,6 @@ struct demux_lavf_opts {
char *format;
char **avopts;
int hacks;
- int genptsmode;
char *sub_cp;
int rtsp_transport;
};
@@ -95,8 +94,6 @@ const struct m_sub_options demux_lavf_conf = {
OPT_INTRANGE("demuxer-lavf-probescore", probescore, 0,
1, AVPROBE_SCORE_MAX),
OPT_FLAG("demuxer-lavf-hacks", hacks, 0),
- OPT_CHOICE("demuxer-lavf-genpts-mode", genptsmode, 0,
- ({"lavf", 1}, {"no", 0})),
OPT_KEYVALUELIST("demuxer-lavf-o", avopts, 0),
OPT_STRING("sub-codepage", sub_cp, 0),
OPT_CHOICE("rtsp-transport", rtsp_transport, 0,
@@ -814,8 +811,6 @@ static int demux_open_lavf(demuxer_t *demuxer, enum demux_check check)
if (!avfc)
return -1;
- if (lavfdopts->genptsmode)
- avfc->flags |= AVFMT_FLAG_GENPTS;
if (index_mode != 1)
avfc->flags |= AVFMT_FLAG_IGNIDX;