diff options
| author | wm4 <wm4@nowhere> | 2012-08-28 23:58:48 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-08-29 00:14:11 +0200 |
| commit | 7bb95cd8a5130a971d3d07eb79ba08fc91e4b7cb (patch) | |
| tree | 69f9a86fb5b4cdedc659af433564e0d120b49bac /libmpcodecs/img_format.h | |
| parent | d5aa8dc88f00ac07f2f35788a230385abd404634 (diff) | |
| download | mpv-7bb95cd8a5130a971d3d07eb79ba08fc91e4b7cb.tar.bz2 mpv-7bb95cd8a5130a971d3d07eb79ba08fc91e4b7cb.tar.xz | |
options, codecs.conf, img_format: unify imgfmt name handling
Remove the duplication of image format name lists from codec-cfg.c
and img_format.c. Remove the list of "long" image format names from
img_format.c.
One user visible change is that now mplayer won't print "long" format
names anymore: e.g. instead of "Planar 420P 10-bit little-endian",
the name "420p10le" is used. This is consistent with the names used
by the option parser, and also less noisy.
Partially based on mplayer2 commit f98e47574de15, with some differences.
Diffstat (limited to 'libmpcodecs/img_format.h')
| -rw-r--r-- | libmpcodecs/img_format.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libmpcodecs/img_format.h b/libmpcodecs/img_format.h index e62ecc4dc1..42e601a270 100644 --- a/libmpcodecs/img_format.h +++ b/libmpcodecs/img_format.h @@ -21,6 +21,7 @@ #include <sys/types.h> #include "config.h" +#include "bstr.h" /* RGB/BGR Formats */ @@ -235,7 +236,7 @@ struct mp_imgfmt_entry { extern struct mp_imgfmt_entry mp_imgfmt_list[]; -unsigned int mp_imgfmt_from_name(const char *name); +unsigned int mp_imgfmt_from_name(bstr name, bool allow_hwaccel); const char *mp_imgfmt_to_name(unsigned int fmt); #endif /* MPLAYER_IMG_FORMAT_H */ |