diff options
| author | wm4 <wm4@nowhere> | 2014-12-22 12:54:18 +0100 |
|---|---|---|
| committer | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-01-25 17:00:14 +0900 |
| commit | 2ade5c84770002727cd2b1892d4231e662dd0fd1 (patch) | |
| tree | ef8c665a8dd69a930ab42853b96b2b4348bd7a54 | |
| parent | 15a191f920fa46c56face1d1364402fbfb498c5c (diff) | |
| download | mpv-2ade5c84770002727cd2b1892d4231e662dd0fd1.tar.bz2 mpv-2ade5c84770002727cd2b1892d4231e662dd0fd1.tar.xz | |
demux_mf: add probing by mime type
Reuses the mime type table introduced in the previous commit.
| -rw-r--r-- | demux/demux_mf.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/demux/demux_mf.c b/demux/demux_mf.c index fa42f52782..5bb2cf392a 100644 --- a/demux/demux_mf.c +++ b/demux/demux_mf.c @@ -33,6 +33,7 @@ #include "stream/stream.h" #include "demux.h" #include "stheader.h" +#include "codec_tags.h" #include "mf.h" #define MF_MAX_FILE_SIZE (1024 * 1024 * 256) @@ -186,7 +187,10 @@ static int demux_open_mf(demuxer_t *demuxer, enum demux_check check) if (!mf || mf->nr_of_files < 1) goto error; - const char *codec = probe_format(mf, demuxer->opts->mf_type, check); + char *force_type = demuxer->opts->mf_type; + const char *codec = mp_map_mimetype_to_video_codec(demuxer->stream->mime_type); + if (!codec || (force_type && force_type[0])) + codec = probe_format(mf, force_type, check); if (!codec) goto error; |