avutil/pixdesc: Remove deprecated off-by-one fields from pix fmt descs

[ffmpeg] / libavutil / pixdesc.h

diff --git a/libavutil/pixdesc.h b/libavutil/pixdesc.h
index c055810ae877243884370f8018cdbe6c983dcee9..81b51b767f8fa5c2108fb233a720473b141ebdc9 100644 (file)
--- a/libavutil/pixdesc.h
+++ b/libavutil/pixdesc.h
@@ -56,17 +56,6 @@ typedef struct AVComponentDescriptor {
      * Number of bits in the component.
      */
     int depth;
-
-#if FF_API_PLUS1_MINUS1
-    /** deprecated, use step instead */
-    attribute_deprecated int step_minus1;
-
-    /** deprecated, use depth instead */
-    attribute_deprecated int depth_minus1;
-
-    /** deprecated, use offset instead */
-    attribute_deprecated int offset_plus1;
-#endif
 } AVComponentDescriptor;
 
 /**
@@ -147,6 +136,7 @@ typedef struct AVPixFmtDescriptor {
  */
 #define AV_PIX_FMT_FLAG_RGB          (1 << 5)
 
+#if FF_API_PSEUDOPAL
 /**
  * The pixel format is "pseudo-paletted". This means that it contains a
  * fixed palette in the 2nd plane but the palette is fixed/constant for each
@@ -164,6 +154,7 @@ typedef struct AVPixFmtDescriptor {
  * before the deprecation, though).
  */
 #define AV_PIX_FMT_FLAG_PSEUDOPAL    (1 << 6)
+#endif
 
 /**
  * The pixel format has an alpha channel. This is set on all formats that