[MPlayer-cvslog] r29486 - in trunk/libmpcodecs: img_format.c img_format.h vf_scale.c

[cehoyos]

Author: cehoyos
Date: Tue Aug 11 19:51:11 2009
New Revision: 29486

Log:
Add IMGFMT_RGB48LE and IMGFMT_RGB48BE.

Modified:
   trunk/libmpcodecs/img_format.c
   trunk/libmpcodecs/img_format.h
   trunk/libmpcodecs/vf_scale.c

Modified: trunk/libmpcodecs/img_format.c
==============================================================================
--- trunk/libmpcodecs/img_format.c	Mon Aug 10 12:53:32 2009	(r29485)
+++ trunk/libmpcodecs/img_format.c	Tue Aug 11 19:51:11 2009	(r29486)
@@ -15,6 +15,8 @@ const char *vo_format_name(int format)
 	case IMGFMT_RGB16: return "RGB 16-bit";
 	case IMGFMT_RGB24: return "RGB 24-bit";
 //	case IMGFMT_RGB32: return "RGB 32-bit";
+	case IMGFMT_RGB48LE: return "RGB 48-bit LE";
+	case IMGFMT_RGB48BE: return "RGB 48-bit BE";
 	case IMGFMT_BGR1: return "BGR 1-bit";
 	case IMGFMT_BGR4: return "BGR 4-bit";
 	case IMGFMT_BG4B: return "BGR 4-bit per byte";

Modified: trunk/libmpcodecs/img_format.h
==============================================================================
--- trunk/libmpcodecs/img_format.h	Mon Aug 10 12:53:32 2009	(r29485)
+++ trunk/libmpcodecs/img_format.h	Tue Aug 11 19:51:11 2009	(r29486)
@@ -13,6 +13,8 @@
 #define IMGFMT_RGB16 (IMGFMT_RGB|16)
 #define IMGFMT_RGB24 (IMGFMT_RGB|24)
 #define IMGFMT_RGB32 (IMGFMT_RGB|32)
+#define IMGFMT_RGB48LE (IMGFMT_RGB|48)
+#define IMGFMT_RGB48BE (IMGFMT_RGB|49)
 
 #define IMGFMT_BGR_MASK 0xFFFFFF00
 #define IMGFMT_BGR (('B'<<24)|('G'<<16)|('R'<<8))

Modified: trunk/libmpcodecs/vf_scale.c
==============================================================================
--- trunk/libmpcodecs/vf_scale.c	Mon Aug 10 12:53:32 2009	(r29485)
+++ trunk/libmpcodecs/vf_scale.c	Tue Aug 11 19:51:11 2009	(r29486)
@@ -474,6 +474,8 @@ static int query_format(struct vf_instan
     case IMGFMT_RGB8:
     case IMGFMT_BG4B:
     case IMGFMT_RG4B:
+    case IMGFMT_RGB48LE:
+    case IMGFMT_RGB48BE:
     {
 	unsigned int best=find_best_out(vf);
 	int flags;