[Mplayer-cvslog] CVS: main codec-cfg.c,1.105,1.106 m_option.c,1.21,1.22

[Alex Beregszaszi]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv17954

Modified Files:
	codec-cfg.c m_option.c 
Log Message:
added nv12/nv21 and some other fourccs (still not synced)

Index: codec-cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/codec-cfg.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- codec-cfg.c	4 Aug 2003 07:46:22 -0000	1.105
+++ codec-cfg.c	31 Aug 2003 21:11:35 -0000	1.106
@@ -132,6 +132,8 @@
 		{"YV12",  IMGFMT_YV12},
 		{"I420",  IMGFMT_I420},
 		{"IYUV",  IMGFMT_IYUV},
+		{"NV12",  IMGFMT_NV12},
+		{"NV21",  IMGFMT_NV21},
 		{"YVU9",  IMGFMT_YVU9},
 		{"IF09",  IMGFMT_IF09},
 		{"444P",  IMGFMT_444P},

Index: m_option.c
===================================================================
RCS file: /cvsroot/mplayer/main/m_option.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- m_option.c	18 Aug 2003 13:49:22 -0000	1.21
+++ m_option.c	31 Aug 2003 21:11:35 -0000	1.22
@@ -914,6 +914,7 @@
 
 #include "libmpcodecs/img_format.h"
 
+/* FIXME: snyc with img_format.h */
 static struct {
   char* name;
   unsigned int fmt;
@@ -922,12 +923,18 @@
   {"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},