@@ -13,6 +13,10 @@ libavutil:   2011-04-18

 API changes, most recent first:

+2011-05-28 - xxxxxx - lavu 51.3.0 - pixdesc.h

+  Add av_get_pix_fmt_name() in libavutil/pixdesc.h, and deprecate

+  avcodec_get_pix_fmt_name() in libavcodec/avcodec.h in its favor.

+

 2011-05-22 - xxxxxx - lavf 53.2.0 - avformat.h

   Introduce avformat_alloc_output_context2() and deprecate

   avformat_alloc_output_context().

@@ -3391,12 +3391,16 @@ int avpicture_layout(const AVPicture* src, enum PixelFormat pix_fmt, int width,

 int avpicture_get_size(enum PixelFormat pix_fmt, int width, int height);

 void avcodec_get_chroma_sub_sample(enum PixelFormat pix_fmt, int *h_shift, int *v_shift);

+#if FF_API_GET_PIX_FMT_NAME

 /**

  * Return the short name for a pixel format.

  *

  * \see av_get_pix_fmt(), av_get_pix_fmt_string().

+ * @deprecated Deprecated in favor of av_get_pix_fmt_name().

  */

+attribute_deprecated

 const char *avcodec_get_pix_fmt_name(enum PixelFormat pix_fmt);

+#endif

 void avcodec_set_dimensions(AVCodecContext *s, int width, int height);

@@ -417,13 +417,12 @@ void avcodec_get_chroma_sub_sample(enum PixelFormat pix_fmt, int *h_shift, int *

     *v_shift = av_pix_fmt_descriptors[pix_fmt].log2_chroma_h;

 }

+#if FF_API_GET_PIX_FMT_NAME

 const char *avcodec_get_pix_fmt_name(enum PixelFormat pix_fmt)

 {

-    if ((unsigned)pix_fmt >= PIX_FMT_NB)

-        return NULL;

-    else

-        return av_pix_fmt_descriptors[pix_fmt].name;

+    return av_get_pix_fmt_name(pix_fmt);

 }

+#endif

 int ff_is_hwaccel_pix_fmt(enum PixelFormat pix_fmt)

 {

@@ -22,7 +22,7 @@

 #define LIBAVCODEC_VERSION_MAJOR 53

 #define LIBAVCODEC_VERSION_MINOR  6

-#define LIBAVCODEC_VERSION_MICRO  0

+#define LIBAVCODEC_VERSION_MICRO  1

 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

                                                LIBAVCODEC_VERSION_MINOR, \

@@ -65,5 +65,8 @@

 #ifndef FF_API_FLAC_GLOBAL_OPTS

 #define FF_API_FLAC_GLOBAL_OPTS (LIBAVCODEC_VERSION_MAJOR < 54)

 #endif

+#ifndef FF_API_GET_PIX_FMT_NAME

+#define FF_API_GET_PIX_FMT_NAME (LIBAVCODEC_VERSION_MAJOR < 54)

+#endif

 #endif /* AVCODEC_VERSION_H */

@@ -40,8 +40,8 @@

 #define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)

 #define LIBAVUTIL_VERSION_MAJOR 51

-#define LIBAVUTIL_VERSION_MINOR  2

-#define LIBAVUTIL_VERSION_MICRO  2

+#define LIBAVUTIL_VERSION_MINOR  3

+#define LIBAVUTIL_VERSION_MICRO  0

 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \

                                                LIBAVUTIL_VERSION_MINOR, \

@@ -906,6 +906,12 @@ static enum PixelFormat get_pix_fmt_internal(const char *name)

     return PIX_FMT_NONE;

 }

+const char *av_get_pix_fmt_name(enum PixelFormat pix_fmt)

+{

+    return (unsigned)pix_fmt < PIX_FMT_NB ?

+        av_pix_fmt_descriptors[pix_fmt].name : NULL;

+}

+

 #if HAVE_BIGENDIAN

 #   define X_NE(be, le) be

 #else

@@ -22,6 +22,7 @@

 #ifndef AVUTIL_PIXDESC_H

 #define AVUTIL_PIXDESC_H

+#include "pixfmt.h"

 #include <inttypes.h>

 typedef struct AVComponentDescriptor{

@@ -142,6 +143,14 @@ void av_write_image_line(const uint16_t *src, uint8_t *data[4], const int linesi

 enum PixelFormat av_get_pix_fmt(const char *name);

 /**

+ * Return the short name for a pixel format, NULL in case pix_fmt is

+ * unknown.

+ *

+ * @see av_get_pix_fmt(), av_get_pix_fmt_string()

+ */

+const char *av_get_pix_fmt_name(enum PixelFormat pix_fmt);

+

+/**

  * Print in buf the string corresponding to the pixel format with

  * number pix_fmt, or an header if pix_fmt is negative.

  *