diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 17:12:23 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 17:12:23 +0200 |
| commit | 0eed703d648c20eea8271be21f46540230d517e6 (patch) | |
| tree | bc748f5c00a45e1c11336d28f2695218cbcc245d /libavutil | |
| parent | c10caea2144fefc5e3e80807f301b3bf7a9b2753 (diff) | |
| parent | 2f8cbbc962dfc0dc1dd0a90b2cd6c21266380f51 (diff) | |
Merge commit '2f8cbbc962dfc0dc1dd0a90b2cd6c21266380f51'
* commit '2f8cbbc962dfc0dc1dd0a90b2cd6c21266380f51':
lavu: Drop deprecated external access to AVPixFmtDescriptor table
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavutil')
| -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 eb52113745..2ad7865691 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -127,10 +127,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 dee4017f90..b0b82852a7 100644 --- a/libavutil/pixdesc.h +++ b/libavutil/pixdesc.h @@ -155,13 +155,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 85126dba03..1ff92d9763 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -90,9 +90,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 |