summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-05-27 22:48:04 +0200
committerwm4 <wm4@nowhere>2013-05-27 22:48:04 +0200
commitf05ec1c7389719f151b9d2053f0050abff7f7252 (patch)
treef729427b4673fb6a95c0407b52c655de3a9351f2 /core
parent7ea5d085f94807bb4ae9e4c8d738dab138d73d49 (diff)
downloadmpv-f05ec1c7389719f151b9d2053f0050abff7f7252.tar.bz2
mpv-f05ec1c7389719f151b9d2053f0050abff7f7252.tar.xz
options: add allow-mimetype suboption for demux_lavf
This can control whether demux_lavf should use the HTTP mime type to determine the format, instead of probing the data with the libavformat API. Do this to allow easier debugging in case the mimetype is incorrect. (This is done only for AAC streams right now.)
Diffstat (limited to 'core')
-rw-r--r--core/defaultopts.c3
-rw-r--r--core/options.h1
2 files changed, 4 insertions, 0 deletions
diff --git a/core/defaultopts.c b/core/defaultopts.c
index 1efb8a1c97..b55dea99f8 100644
--- a/core/defaultopts.c
+++ b/core/defaultopts.c
@@ -100,6 +100,9 @@ void set_default_mplayer_options(struct MPOpts *opts)
.ac3drc = 1.,
.downmix = 1,
},
+ .lavfdopts = {
+ .allow_mimetype = 1,
+ },
.input = {
.key_fifo_size = 7,
.ar_delay = 200,
diff --git a/core/options.h b/core/options.h
index 36a930a132..b2e38ec56d 100644
--- a/core/options.h
+++ b/core/options.h
@@ -223,6 +223,7 @@ typedef struct MPOpts {
int probesize;
int probescore;
int analyzeduration;
+ int allow_mimetype;
char *format;
char *cryptokey;
char *avopt;