summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@mplayer2.org>2012-03-25 23:12:25 +0200
committerwm4 <wm4@mplayer2.org>2012-03-25 23:12:57 +0200
commit84b2c79c56339eae64d5e5f622d8e65f463e5e1f (patch)
tree18740b0864e0babe019d5c01ab1aa37f8723eced
parentbf3f28f0a8c8c532715050a89a952ae476a341d1 (diff)
downloadmpv-84b2c79c56339eae64d5e5f622d8e65f463e5e1f.tar.bz2
mpv-84b2c79c56339eae64d5e5f622d8e65f463e5e1f.tar.xz
libmpcodecs: rename IMGFMT_GBR24P to IMGFMT_GBRP
This is more in line with the ffmpeg/libav names.
-rw-r--r--codec-cfg.c2
-rw-r--r--fmt-conversion.c2
-rw-r--r--libmpcodecs/img_format.c2
-rw-r--r--libmpcodecs/img_format.h2
-rw-r--r--libmpcodecs/mp_image.c2
-rw-r--r--libmpcodecs/vf_scale.c10
-rw-r--r--m_option.c2
7 files changed, 11 insertions, 11 deletions
diff --git a/codec-cfg.c b/codec-cfg.c
index c8d22671b6..b8db55c7ec 100644
--- a/codec-cfg.c
+++ b/codec-cfg.c
@@ -215,7 +215,7 @@ static const struct {
{"BGR32", IMGFMT_BGR32},
{"RGB1", IMGFMT_RGB1},
{"BGR1", IMGFMT_BGR1},
- {"GBR24P", IMGFMT_GBR24P},
+ {"GBRP", IMGFMT_GBRP},
{"MPES", IMGFMT_MPEGPES},
diff --git a/fmt-conversion.c b/fmt-conversion.c
index 2648811b89..a35d99174f 100644
--- a/fmt-conversion.c
+++ b/fmt-conversion.c
@@ -55,7 +55,7 @@ static const struct {
{IMGFMT_RGB8, PIX_FMT_BGR8},
{IMGFMT_RGB4, PIX_FMT_BGR4},
{IMGFMT_BGR8, PIX_FMT_PAL8},
- {IMGFMT_GBR24P, PIX_FMT_GBRP},
+ {IMGFMT_GBRP, PIX_FMT_GBRP},
{IMGFMT_YUY2, PIX_FMT_YUYV422},
{IMGFMT_UYVY, PIX_FMT_UYVY422},
{IMGFMT_NV12, PIX_FMT_NV12},
diff --git a/libmpcodecs/img_format.c b/libmpcodecs/img_format.c
index 0938cce19f..54ccc42b2a 100644
--- a/libmpcodecs/img_format.c
+++ b/libmpcodecs/img_format.c
@@ -50,7 +50,7 @@ const char *vo_format_name(int format)
case IMGFMT_BGRA: return "BGRA";
case IMGFMT_ARGB: return "ARGB";
case IMGFMT_RGBA: return "RGBA";
- case IMGFMT_GBR24P: return "Planar GBR 24-bit";
+ case IMGFMT_GBRP: return "Planar GBR 24-bit";
case IMGFMT_YVU9: return "Planar YVU9";
case IMGFMT_IF09: return "Planar IF09";
case IMGFMT_YV12: return "Planar YV12";
diff --git a/libmpcodecs/img_format.h b/libmpcodecs/img_format.h
index 825bda35b3..a3a475a68b 100644
--- a/libmpcodecs/img_format.h
+++ b/libmpcodecs/img_format.h
@@ -49,7 +49,7 @@
#define IMGFMT_BGR24 (IMGFMT_BGR|24)
#define IMGFMT_BGR32 (IMGFMT_BGR|32)
-#define IMGFMT_GBR24P (('G'<<24)|('B'<<16)|('R'<<8)|24)
+#define IMGFMT_GBRP (('G'<<24)|('B'<<16)|('R'<<8)|24)
#if HAVE_BIGENDIAN
#define IMGFMT_ABGR IMGFMT_RGB32
diff --git a/libmpcodecs/mp_image.c b/libmpcodecs/mp_image.c
index 9c4e6d6bd7..8cdb5eee6b 100644
--- a/libmpcodecs/mp_image.c
+++ b/libmpcodecs/mp_image.c
@@ -122,7 +122,7 @@ void mp_image_setfmt(mp_image_t* mpi,unsigned int out_fmt){
return;
}
mpi->num_planes=3;
- if (out_fmt == IMGFMT_GBR24P) {
+ if (out_fmt == IMGFMT_GBRP) {
mpi->bpp=24;
mpi->flags|=MP_IMGFLAG_PLANAR;
return;
diff --git a/libmpcodecs/vf_scale.c b/libmpcodecs/vf_scale.c
index bfae494c05..4ccef63054 100644
--- a/libmpcodecs/vf_scale.c
+++ b/libmpcodecs/vf_scale.c
@@ -107,7 +107,7 @@ static const unsigned int outfmt_list[]={
IMGFMT_RGB32,
IMGFMT_BGR24,
IMGFMT_RGB24,
- IMGFMT_GBR24P,
+ IMGFMT_GBRP,
IMGFMT_RGB48LE,
IMGFMT_RGB48BE,
IMGFMT_BGR16,
@@ -142,10 +142,10 @@ static int preferred_conversions[][2] = {
{IMGFMT_UYVY, IMGFMT_422P},
{IMGFMT_422P, IMGFMT_YUY2},
{IMGFMT_422P, IMGFMT_UYVY},
- {IMGFMT_GBR24P, IMGFMT_BGR24},
- {IMGFMT_GBR24P, IMGFMT_RGB24},
- {IMGFMT_GBR24P, IMGFMT_BGR32},
- {IMGFMT_GBR24P, IMGFMT_RGB32},
+ {IMGFMT_GBRP, IMGFMT_BGR24},
+ {IMGFMT_GBRP, IMGFMT_RGB24},
+ {IMGFMT_GBRP, IMGFMT_BGR32},
+ {IMGFMT_GBRP, IMGFMT_RGB32},
{0, 0}
};
diff --git a/m_option.c b/m_option.c
index ba98d9c21a..2af87b059f 100644
--- a/m_option.c
+++ b/m_option.c
@@ -1191,7 +1191,7 @@ static struct {
{"argb", IMGFMT_ARGB},
{"bgra", IMGFMT_BGRA},
{"abgr", IMGFMT_ABGR},
- {"gbr24p", IMGFMT_GBR24P},
+ {"gbrp", IMGFMT_GBRP},
{"mjpeg", IMGFMT_MJPEG},
{"mjpg", IMGFMT_MJPEG},
{ NULL, 0 }