From 62925a5c15a76568c155259bafa1361ec139c66b Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 7 Dec 2013 19:39:45 +0100 Subject: options: allow hwaccel formats in -vf format/noformat There are 3 users of the image format option type: demux_raw, vf_format, vf_noformat. Allow the hwaccel formats (like vdpau etc.) in general, so that the filters can use it. This won't work for demux_raw, so explicitly reject these formats there. --- demux/demux_raw.c | 2 +- mpvcore/m_option.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/demux/demux_raw.c b/demux/demux_raw.c index 5ab82893e3..ecabd2e714 100644 --- a/demux/demux_raw.c +++ b/demux/demux_raw.c @@ -126,7 +126,7 @@ static int demux_rawvideo_open(demuxer_t *demuxer, enum demux_check check) const char *decoder = "rawvideo"; int imgfmt = vformat; - if (mp_format) { + if (mp_format && !IMGFMT_IS_HWACCEL(mp_format)) { decoder = "mp-rawvideo"; imgfmt = mp_format; if (!imgsize) { diff --git a/mpvcore/m_option.c b/mpvcore/m_option.c index cda2569454..066500cd71 100644 --- a/mpvcore/m_option.c +++ b/mpvcore/m_option.c @@ -1563,7 +1563,7 @@ static int parse_imgfmt(const m_option_t *opt, struct bstr name, return M_OPT_EXIT - 1; } - unsigned int fmt = mp_imgfmt_from_name(param, false); + unsigned int fmt = mp_imgfmt_from_name(param, true); if (!fmt) { mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option %.*s: unknown format name: '%.*s'\n", -- cgit v1.2.3