From 7bb95cd8a5130a971d3d07eb79ba08fc91e4b7cb Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 28 Aug 2012 23:58:48 +0200 Subject: 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. --- libmpcodecs/img_format.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libmpcodecs/img_format.h') 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 #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 */ -- cgit v1.2.3