From 1e896640c401cff430c6b11e203b23d6c0b2c635 Mon Sep 17 00:00:00 2001
From: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Date: Wed, 18 Mar 2009 20:10:09 +0000
Subject: [PATCH] Implement a name field for AVPixFmtDescriptor.

Originally committed as revision 18035 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/pixdesc.c | 16 ++++++++++++++++
 libavcodec/pixdesc.h |  1 +
 2 files changed, 17 insertions(+)

diff --git a/libavcodec/pixdesc.c b/libavcodec/pixdesc.c
index ceec276a30..b4157fc5e7 100644
--- a/libavcodec/pixdesc.c
+++ b/libavcodec/pixdesc.c
@@ -24,6 +24,7 @@
 
 static const AVPixFmtDescriptor pix_fmt_desc[PIX_FMT_NB] = {
     [PIX_FMT_YUV422P] = {
+        .name = "yuv422p",
         .nb_channels  = 3,
         .log2_chroma_w= 1,
         .log2_chroma_h= 0,
@@ -34,6 +35,7 @@ static const AVPixFmtDescriptor pix_fmt_desc[PIX_FMT_NB] = {
         },
     },
     [PIX_FMT_YUV420P] = {
+        .name = "yuv420p",
         .nb_channels  = 3,
         .log2_chroma_w= 1,
         .log2_chroma_h= 1,
@@ -44,6 +46,7 @@ static const AVPixFmtDescriptor pix_fmt_desc[PIX_FMT_NB] = {
         },
     },
     [PIX_FMT_YUV410P] = {
+        .name = "yuv410p",
         .nb_channels  = 3,
         .log2_chroma_w= 2,
         .log2_chroma_h= 2,
@@ -54,6 +57,7 @@ static const AVPixFmtDescriptor pix_fmt_desc[PIX_FMT_NB] = {
         },
     },
     [PIX_FMT_NV12] = {
+        .name = "nv12",
         .nb_channels  = 3,
         .log2_chroma_w= 1,
         .log2_chroma_h= 1,
@@ -64,6 +68,7 @@ static const AVPixFmtDescriptor pix_fmt_desc[PIX_FMT_NB] = {
         },
     },
     [PIX_FMT_YUYV422] = {
+        .name = "yuyv422",
         .nb_channels  = 3,
         .log2_chroma_w= 1,
         .log2_chroma_h= 0,
@@ -74,6 +79,7 @@ static const AVPixFmtDescriptor pix_fmt_desc[PIX_FMT_NB] = {
         },
     },
     [PIX_FMT_UYVY422] = {
+        .name = "uyvy422",
         .nb_channels  = 3,
         .log2_chroma_w= 1,
         .log2_chroma_h= 0,
@@ -84,6 +90,7 @@ static const AVPixFmtDescriptor pix_fmt_desc[PIX_FMT_NB] = {
         },
     },
     [PIX_FMT_GRAY16LE] = {
+        .name = "gray16le",
         .nb_channels  = 1,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
@@ -92,6 +99,7 @@ static const AVPixFmtDescriptor pix_fmt_desc[PIX_FMT_NB] = {
         },
     },
     [PIX_FMT_GRAY16BE] = {
+        .name = "gray16be",
         .nb_channels  = 1,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
@@ -101,6 +109,7 @@ static const AVPixFmtDescriptor pix_fmt_desc[PIX_FMT_NB] = {
         .flags = PIX_FMT_BE,
     },
     [PIX_FMT_RGB24] = {
+        .name = "rgb24",
         .nb_channels  = 3,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
@@ -111,6 +120,7 @@ static const AVPixFmtDescriptor pix_fmt_desc[PIX_FMT_NB] = {
         },
     },
     [PIX_FMT_RGBA] = {
+        .name = "rgba",
         .nb_channels  = 4,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
@@ -122,6 +132,7 @@ static const AVPixFmtDescriptor pix_fmt_desc[PIX_FMT_NB] = {
         },
     },
     [PIX_FMT_RGB48LE] = {
+        .name = "rgb48le",
         .nb_channels  = 3,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
@@ -132,6 +143,7 @@ static const AVPixFmtDescriptor pix_fmt_desc[PIX_FMT_NB] = {
         },
     },
     [PIX_FMT_RGB48BE] = {
+        .name = "rgb48be",
         .nb_channels  = 3,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
@@ -145,6 +157,7 @@ static const AVPixFmtDescriptor pix_fmt_desc[PIX_FMT_NB] = {
 //FIXME change pix fmt defines so that we have a LE & BE instead of a native-endian
 #if 0
     [PIX_FMT_RGB565LE] = {
+        .name = "rgb565le",
         .nb_channels  = 3,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
@@ -155,6 +168,7 @@ static const AVPixFmtDescriptor pix_fmt_desc[PIX_FMT_NB] = {
         },
     },
     [PIX_FMT_RGB565BE] = {
+        .name = "rgb565be",
         .nb_channels  = 3,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
@@ -167,6 +181,7 @@ static const AVPixFmtDescriptor pix_fmt_desc[PIX_FMT_NB] = {
     },
 #endif
     [PIX_FMT_MONOBLACK] = {
+        .name = "monoblack",
         .nb_channels  = 1,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
@@ -176,6 +191,7 @@ static const AVPixFmtDescriptor pix_fmt_desc[PIX_FMT_NB] = {
         .flags = PIX_FMT_BITSTREAM,
     },
     [PIX_FMT_PAL8] = {
+        .name = "pal8",
         .nb_channels  = 1,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
diff --git a/libavcodec/pixdesc.h b/libavcodec/pixdesc.h
index 95ac9f66a0..edb962fbfe 100644
--- a/libavcodec/pixdesc.h
+++ b/libavcodec/pixdesc.h
@@ -41,6 +41,7 @@ typedef struct AVComponentDescriptor{
  *       are stored not what these values represent.
  */
 typedef struct AVPixFmtDescriptor{
+    const char *name;
     uint8_t nb_channels;        ///< The number of components each pixel has, (1-4)
 
     /**