diff options
| author | wm4 <wm4@nowhere> | 2017-06-18 13:58:42 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2017-06-18 13:58:42 +0200 |
| commit | 32833fa3d14b78cd2a481641cfa174d4bee6533e (patch) | |
| tree | 46e612f1259463d128f17534c2483ae70f5e97cf /video | |
| parent | c680cfd18a09f9a023926db0b3a90f69e8651b37 (diff) | |
| download | mpv-32833fa3d14b78cd2a481641cfa174d4bee6533e.tar.bz2 mpv-32833fa3d14b78cd2a481641cfa174d4bee6533e.tar.xz | |
img_format: minor simplification
Diffstat (limited to 'video')
| -rw-r--r-- | video/img_format.c | 4 | ||||
| -rw-r--r-- | video/img_format.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/video/img_format.c b/video/img_format.c index 64b459bcfb..523caff87a 100644 --- a/video/img_format.c +++ b/video/img_format.c @@ -58,7 +58,7 @@ char **mp_imgfmt_name_list(void) return list; } -int mp_imgfmt_from_name(bstr name, bool allow_hwaccel) +int mp_imgfmt_from_name(bstr name) { int img_fmt = 0; for (const struct mp_imgfmt_entry *p = mp_imgfmt_list; p->name; ++p) { @@ -72,8 +72,6 @@ int mp_imgfmt_from_name(bstr name, bool allow_hwaccel) img_fmt = pixfmt2imgfmt(av_get_pix_fmt(t)); talloc_free(t); } - if (!allow_hwaccel && IMGFMT_IS_HWACCEL(img_fmt)) - return 0; return img_fmt; } diff --git a/video/img_format.h b/video/img_format.h index ee731aa51c..8207ff87d3 100644 --- a/video/img_format.h +++ b/video/img_format.h @@ -236,7 +236,7 @@ static inline bool IMGFMT_IS_RGB(int fmt) #define IMGFMT_RGB_DEPTH(fmt) (mp_imgfmt_get_desc(fmt).plane_bits) #define IMGFMT_IS_HWACCEL(fmt) (mp_imgfmt_get_desc(fmt).flags & MP_IMGFLAG_HWACCEL) -int mp_imgfmt_from_name(bstr name, bool allow_hwaccel); +int mp_imgfmt_from_name(bstr name); char *mp_imgfmt_to_name_buf(char *buf, size_t buf_size, int fmt); #define mp_imgfmt_to_name(fmt) mp_imgfmt_to_name_buf((char[16]){0}, 16, (fmt)) |