From 2f8cbbc962dfc0dc1dd0a90b2cd6c21266380f51 Mon Sep 17 00:00:00 2001
From: Vittorio Giovara <vittorio.giovara@gmail.com>
Date: Tue, 28 Jul 2015 14:30:28 +0100
Subject: lavu: Drop deprecated external access to AVPixFmtDescriptor table

Deprecated in 10/2012.
---
 libavutil/pixdesc.c | 5 +----
 libavutil/pixdesc.h | 7 -------
 libavutil/version.h | 3 ---
 3 files changed, 1 insertion(+), 14 deletions(-)

(limited to 'libavutil')

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
-- 
cgit v1.2.3