lavu: add av_get_pix_fmt_name() convenience function

Also deprecate avcodec_get_pix_fmt_name() in its favor.

Stefano Sabatini committed 15 years ago

Commit e71f2601 parent 34e9c9b7 files · +32 −7Browse files

Unified · Split

7 files

@@ -13,6 +13,10 @@ libavutil: 2011-04-18 · 12 unmodified lines
13		13
14	API changes, most recent first:	14	API changes, most recent first:
15		15
		16	2011-05-28 - xxxxxx - lavu 51.3.0 - pixdesc.h
		17	Add av_get_pix_fmt_name() in libavutil/pixdesc.h, and deprecate
		18	avcodec_get_pix_fmt_name() in libavcodec/avcodec.h in its favor.
		19
16	2011-05-22 - xxxxxx - lavf 53.2.0 - avformat.h	20	2011-05-22 - xxxxxx - lavf 53.2.0 - avformat.h
17	Introduce avformat_alloc_output_context2() and deprecate	21	Introduce avformat_alloc_output_context2() and deprecate
18	avformat_alloc_output_context().	22	avformat_alloc_output_context().

 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);

     *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 av_get_pix_fmt_name(pix_fmt);
-        return NULL;
-    else
-        return av_pix_fmt_descriptors[pix_fmt].name;
 }
+#endif
 int ff_is_hwaccel_pix_fmt(enum PixelFormat pix_fmt)
 {

 #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, \
 #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 @@ · 39 unmodified lines
40	#define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)	40	#define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
41		41
42	#define LIBAVUTIL_VERSION_MAJOR 51	42	#define LIBAVUTIL_VERSION_MAJOR 51
43	#define LIBAVUTIL_VERSION_MINOR 2	43	#define LIBAVUTIL_VERSION_MINOR 3
44	#define LIBAVUTIL_VERSION_MICRO 2	44	#define LIBAVUTIL_VERSION_MICRO 0
45		45
46	#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \	46	#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
47	LIBAVUTIL_VERSION_MINOR, \	47	LIBAVUTIL_VERSION_MINOR, \

     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

 #ifndef AVUTIL_PIXDESC_H
 #define AVUTIL_PIXDESC_H
+#include "pixfmt.h"
 #include <inttypes.h>
 typedef struct AVComponentDescriptor{
  */
 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.

Keyboard shortcuts