summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authorcehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-08-11 17:51:11 +0000
committercehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-08-11 17:51:11 +0000
commitb92666b582b08a3a413fee24c73b25cfa41985e9 (patch)
tree93a757925bd5b4d48bc84d2f102a5f80393245b2 /libmpcodecs
parent180b6a88e4913c325de616d1568c31209484bc62 (diff)
downloadmpv-b92666b582b08a3a413fee24c73b25cfa41985e9.tar.bz2
mpv-b92666b582b08a3a413fee24c73b25cfa41985e9.tar.xz
Add IMGFMT_RGB48LE and IMGFMT_RGB48BE.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29486 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/img_format.c2
-rw-r--r--libmpcodecs/img_format.h2
-rw-r--r--libmpcodecs/vf_scale.c2
3 files changed, 6 insertions, 0 deletions
diff --git a/libmpcodecs/img_format.c b/libmpcodecs/img_format.c
index 789e473f84..4704cf2f6a 100644
--- a/libmpcodecs/img_format.c
+++ b/libmpcodecs/img_format.c
@@ -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";
diff --git a/libmpcodecs/img_format.h b/libmpcodecs/img_format.h
index 559501fb89..b0878f4c1b 100644
--- a/libmpcodecs/img_format.h
+++ b/libmpcodecs/img_format.h
@@ -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))
diff --git a/libmpcodecs/vf_scale.c b/libmpcodecs/vf_scale.c
index ccd0c1c96e..f2c71ed948 100644
--- a/libmpcodecs/vf_scale.c
+++ b/libmpcodecs/vf_scale.c
@@ -474,6 +474,8 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt){
case IMGFMT_RGB8:
case IMGFMT_BG4B:
case IMGFMT_RG4B:
+ case IMGFMT_RGB48LE:
+ case IMGFMT_RGB48BE:
{
unsigned int best=find_best_out(vf);
int flags;