diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-01-22 10:56:42 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-01-27 10:38:34 +0100 |
| commit | 8e5746d46102d7ae3137cfd881e2974b4fca0c89 (patch) | |
| tree | 76d8b0dd56532fd3cbfd14d4acfb7f1ac6ff200d | |
| parent | 0dc6bab092f207f237b166a543cd9ea118825272 (diff) | |
lavc: remove disabled FF_API_GET_PIX_FMT_NAME cruft.
| -rw-r--r-- | libavcodec/avcodec.h | 8 | ||||
| -rw-r--r-- | libavcodec/imgconvert.c | 7 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
3 files changed, 0 insertions, 18 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index d6a40fa048..95458fa3e0 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3343,14 +3343,6 @@ 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 -/** - * @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 eab051bacc..eeffc3f133 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -414,13 +414,6 @@ 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) -{ - return av_get_pix_fmt_name(pix_fmt); -} -#endif - int ff_is_hwaccel_pix_fmt(enum PixelFormat pix_fmt) { return av_pix_fmt_descriptors[pix_fmt].flags & PIX_FMT_HWACCEL; diff --git a/libavcodec/version.h b/libavcodec/version.h index 01b25d29c8..68411e23d6 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -41,9 +41,6 @@ #ifndef FF_API_REQUEST_CHANNELS #define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 55) #endif -#ifndef FF_API_GET_PIX_FMT_NAME -#define FF_API_GET_PIX_FMT_NAME (LIBAVCODEC_VERSION_MAJOR < 54) -#endif #ifndef FF_API_ALLOC_CONTEXT #define FF_API_ALLOC_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 54) #endif |