diff options
| author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-08-31 21:11:35 +0000 |
|---|---|---|
| committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-08-31 21:11:35 +0000 |
| commit | 4736af8f1acd2de465f7f2b8b9f8f0314bd1e837 (patch) | |
| tree | 1b5502fd36b6505880ba0bb506b98a99c2131189 | |
| parent | 0e182f6eac96ff8a2998193f0e19e06816d895be (diff) | |
| download | mpv-4736af8f1acd2de465f7f2b8b9f8f0314bd1e837.tar.bz2 mpv-4736af8f1acd2de465f7f2b8b9f8f0314bd1e837.tar.xz | |
added nv12/nv21 and some other fourccs (still not synced)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10747 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | codec-cfg.c | 2 | ||||
| -rw-r--r-- | m_option.c | 13 |
2 files changed, 12 insertions, 3 deletions
diff --git a/codec-cfg.c b/codec-cfg.c index 627f95ba83..f4e1008392 100644 --- a/codec-cfg.c +++ b/codec-cfg.c @@ -132,6 +132,8 @@ static int add_to_format(char *s, char *alias,unsigned int *fourcc, unsigned int {"YV12", IMGFMT_YV12}, {"I420", IMGFMT_I420}, {"IYUV", IMGFMT_IYUV}, + {"NV12", IMGFMT_NV12}, + {"NV21", IMGFMT_NV21}, {"YVU9", IMGFMT_YVU9}, {"IF09", IMGFMT_IF09}, {"444P", IMGFMT_444P}, diff --git a/m_option.c b/m_option.c index d0dcd3558e..2ccf1bb608 100644 --- a/m_option.c +++ b/m_option.c @@ -914,6 +914,7 @@ m_option_type_t m_option_type_subconfig = { #include "libmpcodecs/img_format.h" +/* FIXME: snyc with img_format.h */ static struct { char* name; unsigned int fmt; @@ -922,12 +923,18 @@ static struct { {"422p", IMGFMT_422P}, {"411p", IMGFMT_411P}, {"yuy2", IMGFMT_YUY2}, - {"yv12", IMGFMT_YV12}, - {"i420", IMGFMT_I420}, + {"uyvy", IMGFMT_UYVY}, {"yvu9", IMGFMT_YVU9}, {"if09", IMGFMT_IF09}, + {"yv12", IMGFMT_YV12}, + {"i420", IMGFMT_I420}, {"iyuv", IMGFMT_IYUV}, - {"uyvy", IMGFMT_UYVY}, + {"clpl", IMGFMT_CLPL}, + {"hm12", IMGFMT_NV12}, + {"y800", IMGFMT_Y800}, + {"y8", IMGFMT_Y8}, + {"nv12", IMGFMT_NV12}, + {"nv21", IMGFMT_NV21}, {"bgr24", IMGFMT_BGR24}, {"bgr32", IMGFMT_BGR32}, {"bgr16", IMGFMT_BGR16}, |