From 982416266c9596bec0ee4a1b1098d37a0f79ad94 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 24 May 2018 19:33:25 +0200 Subject: 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. --- DOCS/man/options.rst | 6 ------ demux/demux_lavf.c | 5 ----- 2 files changed, 11 deletions(-) diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst index 89d9c56eec..9c66ca35cb 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=`` - 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==[,=[,...]]`` Pass AVOptions to libavformat demuxer. diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c index 41c334d309..ee81ff2773 100644 --- a/demux/demux_lavf.c +++ b/demux/demux_lavf.c @@ -77,7 +77,6 @@ struct demux_lavf_opts { char *format; char **avopts; int hacks; - int genptsmode; char *sub_cp; int rtsp_transport; }; @@ -96,8 +95,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; -- cgit v1.2.3