# HG changeset patch
# User stefano
# Date 1259269117 0
# Node ID ecf400e9601b4d1a596167588ae2e9a08d0c0de7
# Parent  0a1d25da1db9c818d4770008c5b4405f0d60f268
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.

diff -r 0a1d25da1db9 -r ecf400e9601b avutil.h
--- a/avutil.h	Tue Nov 24 23:33:41 2009 +0000
+++ b/avutil.h	Thu Nov 26 20:58:37 2009 +0000
@@ -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, \
diff -r 0a1d25da1db9 -r ecf400e9601b pixdesc.c
--- a/pixdesc.c	Tue Nov 24 23:33:41 2009 +0000
+++ b/pixdesc.c	Thu Nov 26 20:58:37 2009 +0000
@@ -112,7 +112,7 @@
         },
     },
     [PIX_FMT_GRAY8] = {
-        .name = "gray8",
+        .name = "gray",
         .nb_components= 1,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
@@ -121,7 +121,7 @@
         },
     },
     [PIX_FMT_MONOWHITE] = {
-        .name = "monowhite",
+        .name = "monow",
         .nb_components= 1,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
@@ -131,7 +131,7 @@
         .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 @@
         },
     },
     [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] = {