Also deprecate avcodec_get_pix_fmt_name() in its favor.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
API changes, most recent first:
+2011-05-XX - xxxxxx - lavu 51.X.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-25 - 30315a8 - lavf 53.1.0 - avformat.h
Add fps_probe_size to AVFormatContext.
*/
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
+/**
+ * @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 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)
{
#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 */
#define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
#define LIBAVUTIL_VERSION_MAJOR 51
-#define LIBAVUTIL_VERSION_MINOR 1
+#define LIBAVUTIL_VERSION_MINOR 2
#define LIBAVUTIL_VERSION_MICRO 0
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
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
#define AVUTIL_PIXDESC_H
#include <inttypes.h>
+#include "pixfmt.h"
typedef struct AVComponentDescriptor{
uint16_t plane :2; ///< which of the 4 planes contains the component
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.
*