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.

Originally committed as revision 20624 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index a510d53e8ac45b396c929048baeadee673abf654..d799211ffc01bc96094edad85d0740e868495630 100644 (file)
--- a/libavutil/avutil.h
+++ b/libavutil/avutil.h
@@ -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 --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c
index ad4efb2517c833abac38b702e37a3766b50c4e1d..b689519fde0bb2023ef47491e8929184abc51bd0 100644 (file)
--- a/libavutil/pixdesc.c
+++ b/libavutil/pixdesc.c
@@ -112,7 +112,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
         },
     },
     [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_descriptors[PIX_FMT_NB] = {
         },
     },
     [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_descriptors[PIX_FMT_NB] = {
         .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_descriptors[PIX_FMT_NB] = {
         },
     },
     [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] = {