diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-05-26 21:19:18 +0400 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-05-28 20:25:40 +0400 |
| commit | e71f26086ab899be7df1efb30b33e0a11973fd8e (patch) | |
| tree | e4e1579d6cd528b113512f50d5995b3933b9ded8 /libavcodec | |
| parent | 34e9c9b11192271a4e5d0557441d09686852c771 (diff) | |
lavu: add av_get_pix_fmt_name() convenience function
Also deprecate avcodec_get_pix_fmt_name() in its favor.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 4 | ||||
| -rw-r--r-- | libavcodec/imgconvert.c | 7 | ||||
| -rw-r--r-- | libavcodec/version.h | 5 |
3 files changed, 11 insertions, 5 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index fdc86bb7c0..ef539a2a36 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -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); diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index a86d2bd027..9aa584fa5c 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -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) { diff --git a/libavcodec/version.h b/libavcodec/version.h index 471e3aaa9a..5a2e0cce2f 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -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 */ |