changeset 34191:47e1375c4d79

Whitespace cosmetics: Align some IMGFMT-lists.
author cehoyos
date Sun, 30 Oct 2011 18:00:25 +0000
parents e491bbbddf5d
children 985b12b73d0d
files codec-cfg.c fmt-conversion.c libmpcodecs/img_format.c libmpcodecs/img_format.h m_option.c
diffstat 5 files changed, 166 insertions(+), 166 deletions(-) [+]
line wrap: on
line diff
--- a/codec-cfg.c	Sun Oct 30 17:40:22 2011 +0000
+++ b/codec-cfg.c	Sun Oct 30 18:00:25 2011 +0000
@@ -162,73 +162,73 @@
     // note: due to parser deficiencies/simplicity, if one format
     // name matches the beginning of another, the longer one _must_
     // come first in this list.
-    {"YV12",  IMGFMT_YV12},
-    {"I420",  IMGFMT_I420},
-    {"IYUV",  IMGFMT_IYUV},
-    {"NV12",  IMGFMT_NV12},
-    {"NV21",  IMGFMT_NV21},
-    {"YVU9",  IMGFMT_YVU9},
-    {"IF09",  IMGFMT_IF09},
-    {"444P16LE", IMGFMT_444P16_LE},
-    {"444P16BE", IMGFMT_444P16_BE},
-    {"444P10LE", IMGFMT_444P10_LE},
-    {"444P10BE", IMGFMT_444P10_BE},
-    {"422P16LE", IMGFMT_422P16_LE},
-    {"422P16BE", IMGFMT_422P16_BE},
-    {"420P16LE", IMGFMT_420P16_LE},
-    {"420P16BE", IMGFMT_420P16_BE},
-    {"444P16", IMGFMT_444P16},
-    {"444P10", IMGFMT_444P10},
-    {"444P9", IMGFMT_444P9},
-    {"422P16", IMGFMT_422P16},
-    {"422P10", IMGFMT_422P10},
-    {"420P16", IMGFMT_420P16},
-    {"420P10", IMGFMT_420P10},
-    {"420P9", IMGFMT_420P9},
-    {"420A",  IMGFMT_420A},
-    {"444P",  IMGFMT_444P},
-    {"422P",  IMGFMT_422P},
-    {"411P",  IMGFMT_411P},
-    {"440P",  IMGFMT_440P},
-    {"Y800",  IMGFMT_Y800},
-    {"Y8",    IMGFMT_Y8},
+    {"YV12",        IMGFMT_YV12},
+    {"I420",        IMGFMT_I420},
+    {"IYUV",        IMGFMT_IYUV},
+    {"NV12",        IMGFMT_NV12},
+    {"NV21",        IMGFMT_NV21},
+    {"YVU9",        IMGFMT_YVU9},
+    {"IF09",        IMGFMT_IF09},
+    {"444P16LE",    IMGFMT_444P16_LE},
+    {"444P16BE",    IMGFMT_444P16_BE},
+    {"444P10LE",    IMGFMT_444P10_LE},
+    {"444P10BE",    IMGFMT_444P10_BE},
+    {"422P16LE",    IMGFMT_422P16_LE},
+    {"422P16BE",    IMGFMT_422P16_BE},
+    {"420P16LE",    IMGFMT_420P16_LE},
+    {"420P16BE",    IMGFMT_420P16_BE},
+    {"444P16",      IMGFMT_444P16},
+    {"444P10",      IMGFMT_444P10},
+    {"444P9",       IMGFMT_444P9},
+    {"422P16",      IMGFMT_422P16},
+    {"422P10",      IMGFMT_422P10},
+    {"420P16",      IMGFMT_420P16},
+    {"420P10",      IMGFMT_420P10},
+    {"420P9",       IMGFMT_420P9},
+    {"420A",        IMGFMT_420A},
+    {"444P",        IMGFMT_444P},
+    {"422P",        IMGFMT_422P},
+    {"411P",        IMGFMT_411P},
+    {"440P",        IMGFMT_440P},
+    {"Y800",        IMGFMT_Y800},
+    {"Y8",          IMGFMT_Y8},
 
-    {"YUY2",  IMGFMT_YUY2},
-    {"UYVY",  IMGFMT_UYVY},
-    {"YVYU",  IMGFMT_YVYU},
+    {"YUY2",        IMGFMT_YUY2},
+    {"UYVY",        IMGFMT_UYVY},
+    {"YVYU",        IMGFMT_YVYU},
 
-    {"RGB48LE",  IMGFMT_RGB48LE},
-    {"RGB48BE",  IMGFMT_RGB48BE},
-    {"RGB4",  IMGFMT_RGB4},
-    {"RGB8",  IMGFMT_RGB8},
-    {"RGB15", IMGFMT_RGB15},
-    {"RGB16", IMGFMT_RGB16},
-    {"RGB24", IMGFMT_RGB24},
-    {"RGB32", IMGFMT_RGB32},
-    {"BGR4",  IMGFMT_BGR4},
-    {"BGR8",  IMGFMT_BGR8},
-    {"BGR15", IMGFMT_BGR15},
-    {"BGR16", IMGFMT_BGR16},
-    {"BGR24", IMGFMT_BGR24},
-    {"BGR32", IMGFMT_BGR32},
-    {"RGB1",  IMGFMT_RGB1},
-    {"BGR1",  IMGFMT_BGR1},
-    {"GBR24P", IMGFMT_GBR24P},
+    {"RGB48LE",     IMGFMT_RGB48LE},
+    {"RGB48BE",     IMGFMT_RGB48BE},
+    {"RGB4",        IMGFMT_RGB4},
+    {"RGB8",        IMGFMT_RGB8},
+    {"RGB15",       IMGFMT_RGB15},
+    {"RGB16",       IMGFMT_RGB16},
+    {"RGB24",       IMGFMT_RGB24},
+    {"RGB32",       IMGFMT_RGB32},
+    {"BGR4",        IMGFMT_BGR4},
+    {"BGR8",        IMGFMT_BGR8},
+    {"BGR15",       IMGFMT_BGR15},
+    {"BGR16",       IMGFMT_BGR16},
+    {"BGR24",       IMGFMT_BGR24},
+    {"BGR32",       IMGFMT_BGR32},
+    {"RGB1",        IMGFMT_RGB1},
+    {"BGR1",        IMGFMT_BGR1},
+    {"GBR24P",      IMGFMT_GBR24P},
 
-    {"MPES",  IMGFMT_MPEGPES},
-    {"ZRMJPEGNI", IMGFMT_ZRMJPEGNI},
-    {"ZRMJPEGIT", IMGFMT_ZRMJPEGIT},
-    {"ZRMJPEGIB", IMGFMT_ZRMJPEGIB},
+    {"MPES",        IMGFMT_MPEGPES},
+    {"ZRMJPEGNI",   IMGFMT_ZRMJPEGNI},
+    {"ZRMJPEGIT",   IMGFMT_ZRMJPEGIT},
+    {"ZRMJPEGIB",   IMGFMT_ZRMJPEGIB},
 
-    {"IDCT_MPEG2",IMGFMT_XVMC_IDCT_MPEG2},
-    {"MOCO_MPEG2",IMGFMT_XVMC_MOCO_MPEG2},
+    {"IDCT_MPEG2",  IMGFMT_XVMC_IDCT_MPEG2},
+    {"MOCO_MPEG2",  IMGFMT_XVMC_MOCO_MPEG2},
 
-    {"VDPAU_MPEG1",IMGFMT_VDPAU_MPEG1},
-    {"VDPAU_MPEG2",IMGFMT_VDPAU_MPEG2},
-    {"VDPAU_H264",IMGFMT_VDPAU_H264},
-    {"VDPAU_WMV3",IMGFMT_VDPAU_WMV3},
-    {"VDPAU_VC1",IMGFMT_VDPAU_VC1},
-    {"VDPAU_MPEG4",IMGFMT_VDPAU_MPEG4},
+    {"VDPAU_MPEG1", IMGFMT_VDPAU_MPEG1},
+    {"VDPAU_MPEG2", IMGFMT_VDPAU_MPEG2},
+    {"VDPAU_H264",  IMGFMT_VDPAU_H264},
+    {"VDPAU_WMV3",  IMGFMT_VDPAU_WMV3},
+    {"VDPAU_VC1",   IMGFMT_VDPAU_VC1},
+    {"VDPAU_MPEG4", IMGFMT_VDPAU_MPEG4},
 
     {NULL,    0}
 };
--- a/fmt-conversion.c	Sun Oct 30 17:40:22 2011 +0000
+++ b/fmt-conversion.c	Sun Oct 30 18:00:25 2011 +0000
@@ -28,51 +28,51 @@
     int fmt;
     enum PixelFormat pix_fmt;
 } conversion_map[] = {
-    {IMGFMT_ARGB, PIX_FMT_ARGB},
-    {IMGFMT_BGRA, PIX_FMT_BGRA},
-    {IMGFMT_BGR24, PIX_FMT_BGR24},
+    {IMGFMT_ARGB,    PIX_FMT_ARGB},
+    {IMGFMT_BGRA,    PIX_FMT_BGRA},
+    {IMGFMT_BGR24,   PIX_FMT_BGR24},
     {IMGFMT_BGR16BE, PIX_FMT_RGB565BE},
     {IMGFMT_BGR16LE, PIX_FMT_RGB565LE},
     {IMGFMT_BGR15BE, PIX_FMT_RGB555BE},
     {IMGFMT_BGR15LE, PIX_FMT_RGB555LE},
     {IMGFMT_BGR12BE, PIX_FMT_RGB444BE},
     {IMGFMT_BGR12LE, PIX_FMT_RGB444LE},
-    {IMGFMT_BGR8,  PIX_FMT_RGB8},
-    {IMGFMT_BGR4,  PIX_FMT_RGB4},
-    {IMGFMT_BGR1,  PIX_FMT_MONOBLACK},
-    {IMGFMT_RGB1,  PIX_FMT_MONOBLACK},
-    {IMGFMT_RG4B,  PIX_FMT_BGR4_BYTE},
-    {IMGFMT_BG4B,  PIX_FMT_RGB4_BYTE},
+    {IMGFMT_BGR8,    PIX_FMT_RGB8},
+    {IMGFMT_BGR4,    PIX_FMT_RGB4},
+    {IMGFMT_BGR1,    PIX_FMT_MONOBLACK},
+    {IMGFMT_RGB1,    PIX_FMT_MONOBLACK},
+    {IMGFMT_RG4B,    PIX_FMT_BGR4_BYTE},
+    {IMGFMT_BG4B,    PIX_FMT_RGB4_BYTE},
     {IMGFMT_RGB48LE, PIX_FMT_RGB48LE},
     {IMGFMT_RGB48BE, PIX_FMT_RGB48BE},
-    {IMGFMT_ABGR, PIX_FMT_ABGR},
-    {IMGFMT_RGBA, PIX_FMT_RGBA},
-    {IMGFMT_RGB24, PIX_FMT_RGB24},
+    {IMGFMT_ABGR,    PIX_FMT_ABGR},
+    {IMGFMT_RGBA,    PIX_FMT_RGBA},
+    {IMGFMT_RGB24,   PIX_FMT_RGB24},
     {IMGFMT_RGB16BE, PIX_FMT_BGR565BE},
     {IMGFMT_RGB16LE, PIX_FMT_BGR565LE},
     {IMGFMT_RGB15BE, PIX_FMT_BGR555BE},
     {IMGFMT_RGB15LE, PIX_FMT_BGR555LE},
     {IMGFMT_RGB12BE, PIX_FMT_BGR444BE},
     {IMGFMT_RGB12LE, PIX_FMT_BGR444LE},
-    {IMGFMT_RGB8,  PIX_FMT_BGR8},
-    {IMGFMT_RGB4,  PIX_FMT_BGR4},
-    {IMGFMT_BGR8,  PIX_FMT_PAL8},
-    {IMGFMT_GBR24P, PIX_FMT_GBR24P},
-    {IMGFMT_YUY2,  PIX_FMT_YUYV422},
-    {IMGFMT_UYVY,  PIX_FMT_UYVY422},
-    {IMGFMT_NV12,  PIX_FMT_NV12},
-    {IMGFMT_NV21,  PIX_FMT_NV21},
-    {IMGFMT_Y800,  PIX_FMT_GRAY8},
-    {IMGFMT_Y8,    PIX_FMT_GRAY8},
-    {IMGFMT_YVU9,  PIX_FMT_YUV410P},
-    {IMGFMT_IF09,  PIX_FMT_YUV410P},
-    {IMGFMT_YV12,  PIX_FMT_YUV420P},
-    {IMGFMT_I420,  PIX_FMT_YUV420P},
-    {IMGFMT_IYUV,  PIX_FMT_YUV420P},
-    {IMGFMT_411P,  PIX_FMT_YUV411P},
-    {IMGFMT_422P,  PIX_FMT_YUV422P},
-    {IMGFMT_444P,  PIX_FMT_YUV444P},
-    {IMGFMT_440P,  PIX_FMT_YUV440P},
+    {IMGFMT_RGB8,    PIX_FMT_BGR8},
+    {IMGFMT_RGB4,    PIX_FMT_BGR4},
+    {IMGFMT_BGR8,    PIX_FMT_PAL8},
+    {IMGFMT_GBR24P,  PIX_FMT_GBR24P},
+    {IMGFMT_YUY2,    PIX_FMT_YUYV422},
+    {IMGFMT_UYVY,    PIX_FMT_UYVY422},
+    {IMGFMT_NV12,    PIX_FMT_NV12},
+    {IMGFMT_NV21,    PIX_FMT_NV21},
+    {IMGFMT_Y800,    PIX_FMT_GRAY8},
+    {IMGFMT_Y8,      PIX_FMT_GRAY8},
+    {IMGFMT_YVU9,    PIX_FMT_YUV410P},
+    {IMGFMT_IF09,    PIX_FMT_YUV410P},
+    {IMGFMT_YV12,    PIX_FMT_YUV420P},
+    {IMGFMT_I420,    PIX_FMT_YUV420P},
+    {IMGFMT_IYUV,    PIX_FMT_YUV420P},
+    {IMGFMT_411P,    PIX_FMT_YUV411P},
+    {IMGFMT_422P,    PIX_FMT_YUV422P},
+    {IMGFMT_444P,    PIX_FMT_YUV444P},
+    {IMGFMT_440P,    PIX_FMT_YUV440P},
 
     {IMGFMT_420A,  PIX_FMT_YUVA420P},
 
@@ -90,8 +90,8 @@
     {IMGFMT_444P16_BE,  PIX_FMT_YUV444P16BE},
     {IMGFMT_444P10_LE,  PIX_FMT_YUV444P10LE},
     {IMGFMT_444P10_BE,  PIX_FMT_YUV444P10BE},
-    {IMGFMT_444P9_LE,  PIX_FMT_YUV444P9LE},
-    {IMGFMT_444P9_BE,  PIX_FMT_YUV444P9BE},
+    {IMGFMT_444P9_LE,   PIX_FMT_YUV444P9LE},
+    {IMGFMT_444P9_BE,   PIX_FMT_YUV444P9BE},
 
     // YUVJ are YUV formats that use the full Y range and not just
     // 16 - 235 (see colorspaces.txt).
--- a/libmpcodecs/img_format.c	Sun Oct 30 17:40:22 2011 +0000
+++ b/libmpcodecs/img_format.c	Sun Oct 30 18:00:25 2011 +0000
@@ -26,45 +26,45 @@
     static char unknown_format[20];
     switch(format)
     {
-    case IMGFMT_RGB1: return "RGB 1-bit";
-    case IMGFMT_RGB4: return "RGB 4-bit";
-    case IMGFMT_RG4B: return "RGB 4-bit per byte";
-    case IMGFMT_RGB8: return "RGB 8-bit";
-    case IMGFMT_RGB12: return "RGB 12-bit";
-    case IMGFMT_RGB15: return "RGB 15-bit";
-    case IMGFMT_RGB16: return "RGB 16-bit";
-    case IMGFMT_RGB24: return "RGB 24-bit";
-//  case IMGFMT_RGB32: return "RGB 32-bit";
+    case IMGFMT_RGB1:    return "RGB 1-bit";
+    case IMGFMT_RGB4:    return "RGB 4-bit";
+    case IMGFMT_RG4B:    return "RGB 4-bit per byte";
+    case IMGFMT_RGB8:    return "RGB 8-bit";
+    case IMGFMT_RGB12:   return "RGB 12-bit";
+    case IMGFMT_RGB15:   return "RGB 15-bit";
+    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";
-    case IMGFMT_BGR8: return "BGR 8-bit";
-    case IMGFMT_BGR12: return "BGR 12-bit";
-    case IMGFMT_BGR15: return "BGR 15-bit";
-    case IMGFMT_BGR16: return "BGR 16-bit";
-    case IMGFMT_BGR24: return "BGR 24-bit";
-//  case IMGFMT_BGR32: return "BGR 32-bit";
-    case IMGFMT_ABGR: return "ABGR";
-    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_YVU9: return "Planar YVU9";
-    case IMGFMT_IF09: return "Planar IF09";
-    case IMGFMT_YV12: return "Planar YV12";
-    case IMGFMT_I420: return "Planar I420";
-    case IMGFMT_IYUV: return "Planar IYUV";
-    case IMGFMT_CLPL: return "Planar CLPL";
-    case IMGFMT_Y800: return "Planar Y800";
-    case IMGFMT_Y8: return "Planar Y8";
+    case IMGFMT_BGR1:    return "BGR 1-bit";
+    case IMGFMT_BGR4:    return "BGR 4-bit";
+    case IMGFMT_BG4B:    return "BGR 4-bit per byte";
+    case IMGFMT_BGR8:    return "BGR 8-bit";
+    case IMGFMT_BGR12:   return "BGR 12-bit";
+    case IMGFMT_BGR15:   return "BGR 15-bit";
+    case IMGFMT_BGR16:   return "BGR 16-bit";
+    case IMGFMT_BGR24:   return "BGR 24-bit";
+//  case IMGFMT_BGR32:   return "BGR 32-bit";
+    case IMGFMT_ABGR:    return "ABGR";
+    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_YVU9:    return "Planar YVU9";
+    case IMGFMT_IF09:    return "Planar IF09";
+    case IMGFMT_YV12:    return "Planar YV12";
+    case IMGFMT_I420:    return "Planar I420";
+    case IMGFMT_IYUV:    return "Planar IYUV";
+    case IMGFMT_CLPL:    return "Planar CLPL";
+    case IMGFMT_Y800:    return "Planar Y800";
+    case IMGFMT_Y8:      return "Planar Y8";
     case IMGFMT_420P16_LE: return "Planar 420P 16-bit little-endian";
     case IMGFMT_420P16_BE: return "Planar 420P 16-bit big-endian";
     case IMGFMT_420P10_LE: return "Planar 420P 10-bit little-endian";
     case IMGFMT_420P10_BE: return "Planar 420P 10-bit big-endian";
-    case IMGFMT_420P9_LE: return "Planar 420P 9-bit little-endian";
-    case IMGFMT_420P9_BE: return "Planar 420P 9-bit big-endian";
+    case IMGFMT_420P9_LE:  return "Planar 420P 9-bit little-endian";
+    case IMGFMT_420P9_BE:  return "Planar 420P 9-bit big-endian";
     case IMGFMT_422P16_LE: return "Planar 422P 16-bit little-endian";
     case IMGFMT_422P16_BE: return "Planar 422P 16-bit big-endian";
     case IMGFMT_422P10_LE: return "Planar 422P 10-bit little-endian";
@@ -73,8 +73,8 @@
     case IMGFMT_444P16_BE: return "Planar 444P 16-bit big-endian";
     case IMGFMT_444P10_LE: return "Planar 444P 10-bit little-endian";
     case IMGFMT_444P10_BE: return "Planar 444P 10-bit big-endian";
-    case IMGFMT_444P9_LE: return "Planar 444P 9-bit little-endian";
-    case IMGFMT_444P9_BE: return "Planar 444P 9-bit big-endian";
+    case IMGFMT_444P9_LE:  return "Planar 444P 9-bit little-endian";
+    case IMGFMT_444P9_BE:  return "Planar 444P 9-bit big-endian";
     case IMGFMT_420A: return "Planar 420P with alpha";
     case IMGFMT_444P: return "Planar 444P";
     case IMGFMT_422P: return "Planar 422P";
@@ -102,18 +102,18 @@
     case IMGFMT_CLJR: return "Packed CLJR";
     case IMGFMT_YUVP: return "Packed YUVP";
     case IMGFMT_UYVP: return "Packed UYVP";
-    case IMGFMT_MPEGPES: return "Mpeg PES";
-    case IMGFMT_ZRMJPEGNI: return "Zoran MJPEG non-interlaced";
-    case IMGFMT_ZRMJPEGIT: return "Zoran MJPEG top field first";
-    case IMGFMT_ZRMJPEGIB: return "Zoran MJPEG bottom field first";
+    case IMGFMT_MPEGPES:         return "Mpeg PES";
+    case IMGFMT_ZRMJPEGNI:       return "Zoran MJPEG non-interlaced";
+    case IMGFMT_ZRMJPEGIT:       return "Zoran MJPEG top field first";
+    case IMGFMT_ZRMJPEGIB:       return "Zoran MJPEG bottom field first";
     case IMGFMT_XVMC_MOCO_MPEG2: return "MPEG1/2 Motion Compensation";
     case IMGFMT_XVMC_IDCT_MPEG2: return "MPEG1/2 Motion Compensation and IDCT";
-    case IMGFMT_VDPAU_MPEG1: return "MPEG1 VDPAU acceleration";
-    case IMGFMT_VDPAU_MPEG2: return "MPEG2 VDPAU acceleration";
-    case IMGFMT_VDPAU_H264: return "H.264 VDPAU acceleration";
-    case IMGFMT_VDPAU_MPEG4: return "MPEG-4 Part 2 VDPAU acceleration";
-    case IMGFMT_VDPAU_WMV3: return "WMV3 VDPAU acceleration";
-    case IMGFMT_VDPAU_VC1: return "VC1 VDPAU acceleration";
+    case IMGFMT_VDPAU_MPEG1:     return "MPEG1 VDPAU acceleration";
+    case IMGFMT_VDPAU_MPEG2:     return "MPEG2 VDPAU acceleration";
+    case IMGFMT_VDPAU_H264:      return "H.264 VDPAU acceleration";
+    case IMGFMT_VDPAU_MPEG4:     return "MPEG-4 Part 2 VDPAU acceleration";
+    case IMGFMT_VDPAU_WMV3:      return "WMV3 VDPAU acceleration";
+    case IMGFMT_VDPAU_VC1:       return "VC1 VDPAU acceleration";
     }
     snprintf(unknown_format,20,"Unknown 0x%04x",format);
     return unknown_format;
--- a/libmpcodecs/img_format.h	Sun Oct 30 17:40:22 2011 +0000
+++ b/libmpcodecs/img_format.h	Sun Oct 30 18:00:25 2011 +0000
@@ -39,10 +39,10 @@
 
 #define IMGFMT_BGR_MASK 0xFFFFFF00
 #define IMGFMT_BGR (('B'<<24)|('G'<<16)|('R'<<8))
-#define IMGFMT_BGR1 (IMGFMT_BGR|1)
-#define IMGFMT_BGR4 (IMGFMT_BGR|4)
+#define IMGFMT_BGR1  (IMGFMT_BGR|1)
+#define IMGFMT_BGR4  (IMGFMT_BGR|4)
 #define IMGFMT_BGR4_CHAR (IMGFMT_BGR|4|128) // BGR4 with 1 pixel per byte
-#define IMGFMT_BGR8 (IMGFMT_BGR|8)
+#define IMGFMT_BGR8  (IMGFMT_BGR|8)
 #define IMGFMT_BGR12 (IMGFMT_BGR|12)
 #define IMGFMT_BGR15 (IMGFMT_BGR|15)
 #define IMGFMT_BGR16 (IMGFMT_BGR|16)
@@ -52,10 +52,10 @@
 #define IMGFMT_GBR24P (('G'<<24)|('B'<<16)|('R'<<8)|24)
 
 #if HAVE_BIGENDIAN
-#define IMGFMT_ABGR IMGFMT_RGB32
-#define IMGFMT_BGRA (IMGFMT_RGB32|64)
-#define IMGFMT_ARGB IMGFMT_BGR32
-#define IMGFMT_RGBA (IMGFMT_BGR32|64)
+#define IMGFMT_ABGR    IMGFMT_RGB32
+#define IMGFMT_BGRA    (IMGFMT_RGB32|64)
+#define IMGFMT_ARGB    IMGFMT_BGR32
+#define IMGFMT_RGBA    (IMGFMT_BGR32|64)
 #define IMGFMT_RGB48NE IMGFMT_RGB48BE
 #define IMGFMT_RGB12BE IMGFMT_RGB12
 #define IMGFMT_RGB12LE (IMGFMT_RGB12|64)
@@ -127,8 +127,8 @@
 #define IMGFMT_444P16_BE 0x34343451
 #define IMGFMT_444P10_LE 0x52343434
 #define IMGFMT_444P10_BE 0x34343452
-#define IMGFMT_444P9_LE 0x53343434
-#define IMGFMT_444P9_BE 0x34343453
+#define IMGFMT_444P9_LE  0x53343434
+#define IMGFMT_444P9_BE  0x34343453
 #define IMGFMT_422P16_LE 0x51323234
 #define IMGFMT_422P16_BE 0x34323251
 #define IMGFMT_422P10_LE 0x52323234
@@ -137,27 +137,27 @@
 #define IMGFMT_420P16_BE 0x34323051
 #define IMGFMT_420P10_LE 0x52303234
 #define IMGFMT_420P10_BE 0x34323052
-#define IMGFMT_420P9_LE 0x53303234
-#define IMGFMT_420P9_BE 0x34323053
+#define IMGFMT_420P9_LE  0x53303234
+#define IMGFMT_420P9_BE  0x34323053
 #if HAVE_BIGENDIAN
 #define IMGFMT_444P16 IMGFMT_444P16_BE
 #define IMGFMT_444P10 IMGFMT_444P10_BE
-#define IMGFMT_444P9 IMGFMT_444P9_BE
+#define IMGFMT_444P9  IMGFMT_444P9_BE
 #define IMGFMT_422P16 IMGFMT_422P16_BE
 #define IMGFMT_422P10 IMGFMT_422P10_BE
 #define IMGFMT_420P16 IMGFMT_420P16_BE
 #define IMGFMT_420P10 IMGFMT_420P10_BE
-#define IMGFMT_420P9 IMGFMT_420P9_BE
+#define IMGFMT_420P9  IMGFMT_420P9_BE
 #define IMGFMT_IS_YUVP16_NE(fmt) IMGFMT_IS_YUVP16_BE(fmt)
 #else
 #define IMGFMT_444P16 IMGFMT_444P16_LE
 #define IMGFMT_444P10 IMGFMT_444P10_LE
-#define IMGFMT_444P9 IMGFMT_444P9_LE
+#define IMGFMT_444P9  IMGFMT_444P9_LE
 #define IMGFMT_422P16 IMGFMT_422P16_LE
 #define IMGFMT_422P10 IMGFMT_422P10_LE
 #define IMGFMT_420P16 IMGFMT_420P16_LE
 #define IMGFMT_420P10 IMGFMT_420P10_LE
-#define IMGFMT_420P9 IMGFMT_420P9_LE
+#define IMGFMT_420P9  IMGFMT_420P9_LE
 #define IMGFMT_IS_YUVP16_NE(fmt) IMGFMT_IS_YUVP16_LE(fmt)
 #endif
 
--- a/m_option.c	Sun Oct 30 17:40:22 2011 +0000
+++ b/m_option.c	Sun Oct 30 18:00:25 2011 +0000
@@ -1078,8 +1078,8 @@
   {"444p16be", IMGFMT_444P16_BE},
   {"444p10le", IMGFMT_444P10_LE},
   {"444p10be", IMGFMT_444P10_BE},
-  {"444p9le", IMGFMT_444P9_LE},
-  {"444p9be", IMGFMT_444P9_BE},
+  {"444p9le",  IMGFMT_444P9_LE},
+  {"444p9be",  IMGFMT_444P9_BE},
   {"422p16le", IMGFMT_422P16_LE},
   {"422p16be", IMGFMT_422P16_BE},
   {"422p10le", IMGFMT_422P10_LE},
@@ -1088,14 +1088,14 @@
   {"420p16be", IMGFMT_420P16_BE},
   {"420p10le", IMGFMT_420P10_LE},
   {"420p10be", IMGFMT_420P10_BE},
-  {"420p9le", IMGFMT_420P9_LE},
-  {"420p9be", IMGFMT_420P9_BE},
-  {"444p16", IMGFMT_444P16},
-  {"422p16", IMGFMT_422P16},
-  {"422p10", IMGFMT_422P10},
-  {"420p16", IMGFMT_420P16},
-  {"420p10", IMGFMT_420P10},
-  {"420p9", IMGFMT_420P9},
+  {"420p9le",  IMGFMT_420P9_LE},
+  {"420p9be",  IMGFMT_420P9_BE},
+  {"444p16",   IMGFMT_444P16},
+  {"422p16",   IMGFMT_422P16},
+  {"422p10",   IMGFMT_422P10},
+  {"420p16",   IMGFMT_420P16},
+  {"420p10",   IMGFMT_420P10},
+  {"420p9",    IMGFMT_420P9},
   {"420a", IMGFMT_420A},
   {"444p", IMGFMT_444P},
   {"422p", IMGFMT_422P},
@@ -1112,7 +1112,7 @@
   {"clpl", IMGFMT_CLPL},
   {"hm12", IMGFMT_HM12},
   {"y800", IMGFMT_Y800},
-  {"y8", IMGFMT_Y8},
+  {"y8",   IMGFMT_Y8},
   {"nv12", IMGFMT_NV12},
   {"nv21", IMGFMT_NV21},
   {"bgr24", IMGFMT_BGR24},