diff options
author | wm4 <wm4@nowhere> | 2013-05-27 22:48:04 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-05-27 22:48:04 +0200 |
commit | f05ec1c7389719f151b9d2053f0050abff7f7252 (patch) | |
tree | f729427b4673fb6a95c0407b52c655de3a9351f2 /demux | |
parent | 7ea5d085f94807bb4ae9e4c8d738dab138d73d49 (diff) | |
download | mpv-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 'demux')
-rw-r--r-- | demux/demux_lavf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c index 2141d3ab0a..58fe390507 100644 --- a/demux/demux_lavf.c +++ b/demux/demux_lavf.c @@ -55,6 +55,7 @@ const m_option_t lavfdopts_conf[] = { OPT_INTRANGE("probesize", lavfdopts.probesize, 0, 32, INT_MAX), OPT_STRING("format", lavfdopts.format, 0), OPT_INTRANGE("analyzeduration", lavfdopts.analyzeduration, 0, 0, INT_MAX), + OPT_FLAG("allow-mimetype", lavfdopts.allow_mimetype, 0), OPT_INTRANGE("probescore", lavfdopts.probescore, 0, 0, 100), OPT_STRING("cryptokey", lavfdopts.cryptokey, 0), OPT_STRING("o", lavfdopts.avopt, 0), @@ -218,7 +219,7 @@ static int lavf_check_file(demuxer_t *demuxer) format = demuxer->stream->lavf_type; if (!format) format = avdevice_format; - if (!format && demuxer->stream->mime_type) + if (!format && lavfdopts->allow_mimetype && demuxer->stream->mime_type) format = (char *)find_demuxer_from_mime_type(demuxer->stream->mime_type); if (format) { if (strcmp(format, "help") == 0) { |