diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 18:12:23 +0300 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 18:12:23 +0300 |
| commit | 0eed703d648c20eea8271be21f46540230d517e6 (patch) | |
| tree | bc748f5c00a45e1c11336d28f2695218cbcc245d /libavutil/pixdesc.c | |
| 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/pixdesc.c')
| -rw-r--r-- | libavutil/pixdesc.c | 5 |
1 files changed, 1 insertions, 4 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, |