diff options
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/img_format.c | 2 | ||||
| -rw-r--r-- | libmpcodecs/img_format.h | 2 | ||||
| -rw-r--r-- | libmpcodecs/mp_image.c | 2 | ||||
| -rw-r--r-- | libmpcodecs/vf_scale.c | 10 |
4 files changed, 8 insertions, 8 deletions
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} }; |