diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-07-28 14:30:28 +0100 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-08-28 16:04:27 +0200 |
| commit | 2f8cbbc962dfc0dc1dd0a90b2cd6c21266380f51 (patch) | |
| tree | efb300d73f9e0740d14f149229729b37b51dc6a2 | |
| parent | 183db02a51a422568084b113a7571c845ca68622 (diff) | |
| download | ffmpeg-2f8cbbc962dfc0dc1dd0a90b2cd6c21266380f51.tar.gz | |
lavu: Drop deprecated external access to AVPixFmtDescriptor table
Deprecated in 10/2012.
| -rw-r--r-- | libavutil/pixdesc.c | 5 | ||||
| -rw-r--r-- | libavutil/pixdesc.h | 7 | ||||
| -rw-r--r-- | libavutil/version.h | 3 |
3 files changed, 1 insertions, 14 deletions
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index c2c0157e7a..cec35439fd 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -126,10 +126,7 @@ void av_write_image_line(const uint16_t *src, } } -#if !FF_API_PIX_FMT_DESC -static -#endif -const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { +static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { [AV_PIX_FMT_YUV420P] = { .name = "yuv420p", .nb_components = 3, diff --git a/libavutil/pixdesc.h b/libavutil/pixdesc.h index 8a97095186..351391389c 100644 --- a/libavutil/pixdesc.h +++ b/libavutil/pixdesc.h @@ -137,13 +137,6 @@ typedef struct AVPixFmtDescriptor { */ #define AV_PIX_FMT_FLAG_ALPHA (1 << 7) -#if FF_API_PIX_FMT_DESC -/** - * The array of all the pixel format descriptors. - */ -extern attribute_deprecated const AVPixFmtDescriptor av_pix_fmt_descriptors[]; -#endif - /** * Read a line from an image, and write the values of the * pixel format component c to dst. diff --git a/libavutil/version.h b/libavutil/version.h index ad758cb49c..26fba376cb 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -81,9 +81,6 @@ #ifndef FF_API_CONTEXT_SIZE #define FF_API_CONTEXT_SIZE (LIBAVUTIL_VERSION_MAJOR < 55) #endif -#ifndef FF_API_PIX_FMT_DESC -#define FF_API_PIX_FMT_DESC (LIBAVUTIL_VERSION_MAJOR < 55) -#endif #ifndef FF_API_AV_REVERSE #define FF_API_AV_REVERSE (LIBAVUTIL_VERSION_MAJOR < 55) #endif |