diff options
| author | James Almer <jamrial@gmail.com> | 2014-09-14 21:46:20 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2014-10-05 17:10:29 -0300 |
| commit | fb7d8d50bc242c739dad42e4f4a6b98bb3f1eee6 (patch) | |
| tree | f8104d896da1d8b17e213e1b33efc692d8a3cd44 | |
| parent | ddc376816161bdb24caa0a6698f8a18b41c6f70a (diff) | |
| download | ffmpeg-fb7d8d50bc242c739dad42e4f4a6b98bb3f1eee6.tar.gz | |
swscale: remove obsolete FF_API_SWS_FORMAT_NAME cruft
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libswscale/swscale_internal.h | 8 | ||||
| -rw-r--r-- | libswscale/utils.c | 11 | ||||
| -rw-r--r-- | libswscale/version.h | 3 |
3 files changed, 0 insertions, 22 deletions
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 335e1f8d7e..1e53690908 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -611,14 +611,6 @@ av_cold void ff_sws_init_range_convert(SwsContext *c); SwsFunc ff_yuv2rgb_init_x86(SwsContext *c); SwsFunc ff_yuv2rgb_init_ppc(SwsContext *c); -#if FF_API_SWS_FORMAT_NAME -/** - * @deprecated Use av_get_pix_fmt_name() instead. - */ -attribute_deprecated -const char *sws_format_name(enum AVPixelFormat format); -#endif - static av_always_inline int is16BPS(enum AVPixelFormat pix_fmt) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); diff --git a/libswscale/utils.c b/libswscale/utils.c index 56157001f0..dfdeb38479 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -240,17 +240,6 @@ int sws_isSupportedEndiannessConversion(enum AVPixelFormat pix_fmt) format_entries[pix_fmt].is_supported_endianness : 0; } -#if FF_API_SWS_FORMAT_NAME -const char *sws_format_name(enum AVPixelFormat format) -{ - const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(format); - if (desc) - return desc->name; - else - return "Unknown format"; -} -#endif - static double getSplineCoeff(double a, double b, double c, double d, double dist) { diff --git a/libswscale/version.h b/libswscale/version.h index 77c374ea30..ff7de293f5 100644 --- a/libswscale/version.h +++ b/libswscale/version.h @@ -49,9 +49,6 @@ #ifndef FF_API_SWS_CPU_CAPS #define FF_API_SWS_CPU_CAPS (LIBSWSCALE_VERSION_MAJOR < 4) #endif -#ifndef FF_API_SWS_FORMAT_NAME -#define FF_API_SWS_FORMAT_NAME (LIBSWSCALE_VERSION_MAJOR < 3) -#endif #ifndef FF_API_ARCH_BFIN #define FF_API_ARCH_BFIN (LIBSWSCALE_VERSION_MAJOR < 4) #endif |