summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-07-07 23:54:11 +0200
committerwm4 <wm4@nowhere>2013-07-07 23:54:11 +0200
commitaf0c41e162725b0edcd6c3d066a2dbef05a3b896 (patch)
tree607f2aa997815accec54e838cde124df845c7f38 /core
parent8781e5a55c5f250e7c637a4cc9c4d8f91b227314 (diff)
downloadmpv-af0c41e162725b0edcd6c3d066a2dbef05a3b896.tar.bz2
mpv-af0c41e162725b0edcd6c3d066a2dbef05a3b896.tar.xz
Remove old demuxers
Delete demux_avi, demux_asf, demux_mpg, demux_ts. libavformat does better than them (except in rare corner cases), and the demuxers have a bad influence on the rest of the code. Often they don't output proper packets, and require additional audio and video parsing. Most work only in --no-correct-pts mode. Remove them to facilitate further cleanups.
Diffstat (limited to 'core')
-rw-r--r--core/options.c13
-rw-r--r--core/options.h1
2 files changed, 6 insertions, 8 deletions
diff --git a/core/options.c b/core/options.c
index b00f79c003..c0e64b0dcd 100644
--- a/core/options.c
+++ b/core/options.c
@@ -25,6 +25,7 @@
#include <stddef.h>
#include <sys/types.h>
+#include <limits.h>
#include "core/options.h"
#include "config.h"
@@ -369,12 +370,9 @@ const m_option_t mp_opts[] = {
OPT_FLAG("pause", pause, 0),
OPT_FLAG("keep-open", keep_open, 0),
- // AVI specific: force non-interleaved mode
- {"avi-ni", &force_ni, CONF_TYPE_FLAG, 0, 0, 1, NULL},
-
// AVI and Ogg only: (re)build index at startup
- {"idx", &index_mode, CONF_TYPE_FLAG, 0, -1, 1, NULL},
- {"forceidx", &index_mode, CONF_TYPE_FLAG, 0, -1, 2, NULL},
+ OPT_FLAG_CONSTANTS("idx", index_mode, 0, -1, 1),
+ OPT_FLAG_STORE("forceidx", index_mode, 0, 2),
// select audio/video/subtitle stream
OPT_TRACKCHOICE("aid", audio_id),
@@ -419,9 +417,6 @@ const m_option_t mp_opts[] = {
// ------------------------- a-v sync options --------------------
- // AVI specific: A-V sync mode (bps vs. interleaving)
- {"bps", &pts_from_bps, CONF_TYPE_FLAG, 0, 0, 1, NULL},
-
// set A-V sync correction speed (0=disables it):
OPT_FLOATRANGE("mc", default_max_pts_correction, 0, 0, 100),
@@ -804,6 +799,8 @@ const struct MPOpts mp_default_opts = {
.hwdec_codecs = "all",
+ .index_mode = -1,
+
.ad_lavc_param = {
.ac3drc = 1.,
.downmix = 1,
diff --git a/core/options.h b/core/options.h
index 1eb111e33e..f7be4adb02 100644
--- a/core/options.h
+++ b/core/options.h
@@ -160,6 +160,7 @@ typedef struct MPOpts {
char *screenshot_template;
double force_fps;
+ int index_mode; // -1=untouched 0=don't use index 1=use (generate) index
struct mp_chmap audio_output_channels;
int audio_output_format;