[FFmpeg-cvslog] r20624 - in trunk/libavutil: avutil.h pixdesc.c

[stefano]

Author: stefano
Date: Thu Nov 26 21:58:37 2009
New Revision: 20624

Log:
Make av_pix_fmt_descriptors use the same pixel format names as defined
in libavcodec/imgconvert.c.

Avoid to break compatility when making the functions dealing with
pixel format names in imgconvert.c use the names defined in pixdescs.

Modified:
   trunk/libavutil/avutil.h
   trunk/libavutil/pixdesc.c

Modified: trunk/libavutil/avutil.h
==============================================================================
--- trunk/libavutil/avutil.h	Thu Nov 26 21:46:13 2009	(r20623)
+++ trunk/libavutil/avutil.h	Thu Nov 26 21:58:37 2009	(r20624)
@@ -36,7 +36,7 @@
 
 #define LIBAVUTIL_VERSION_MAJOR 50
 #define LIBAVUTIL_VERSION_MINOR  5
-#define LIBAVUTIL_VERSION_MICRO  0
+#define LIBAVUTIL_VERSION_MICRO  1
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
                                                LIBAVUTIL_VERSION_MINOR, \

Modified: trunk/libavutil/pixdesc.c
==============================================================================
--- trunk/libavutil/pixdesc.c	Thu Nov 26 21:46:13 2009	(r20623)
+++ trunk/libavutil/pixdesc.c	Thu Nov 26 21:58:37 2009	(r20624)
@@ -112,7 +112,7 @@ const AVPixFmtDescriptor av_pix_fmt_desc
         },
     },
     [PIX_FMT_GRAY8] = {
-        .name = "gray8",
+        .name = "gray",
         .nb_components= 1,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
@@ -121,7 +121,7 @@ const AVPixFmtDescriptor av_pix_fmt_desc
         },
     },
     [PIX_FMT_MONOWHITE] = {
-        .name = "monowhite",
+        .name = "monow",
         .nb_components= 1,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
@@ -131,7 +131,7 @@ const AVPixFmtDescriptor av_pix_fmt_desc
         .flags = PIX_FMT_BITSTREAM,
     },
     [PIX_FMT_MONOBLACK] = {
-        .name = "monoblack",
+        .name = "monob",
         .nb_components= 1,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
@@ -184,11 +184,11 @@ const AVPixFmtDescriptor av_pix_fmt_desc
         },
     },
     [PIX_FMT_XVMC_MPEG2_MC] = {
-        .name = "xvmc_mpeg2_mc",
+        .name = "xvmcmc",
         .flags = PIX_FMT_HWACCEL,
     },
     [PIX_FMT_XVMC_MPEG2_IDCT] = {
-        .name = "xvmc_mpeg2_idct",
+        .name = "xvmcidct",
         .flags = PIX_FMT_HWACCEL,
     },
     [PIX_FMT_UYVY422] = {