From b7d0db8bfed7e9dac40f62977b016b3b8e5fdbc7 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 22 Dec 2014 12:54:18 +0100 Subject: demux_mf: add probing by mime type Reuses the mime type table introduced in the previous commit. --- demux/demux_mf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'demux/demux_mf.c') 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; -- cgit v1.2.3