Merge commit '2268db2cd052674fde55c7d48b7a5098ce89b4ba'

* commit '2268db2cd052674fde55c7d48b7a5098ce89b4ba':
  lavu: Drop the {minus,plus}1 suffix from AVComponentDescriptor fields

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

1 files changed, 18 insertions, 6 deletions

diff --git a/libavutil/pixdesc.h b/libavutil/pixdesc.h
index b92aa443c1..d9999058e4 100644
--- a/libavutil/pixdesc.h
+++ b/libavutil/pixdesc.h
@@ -26,6 +26,7 @@
 
 #include "attributes.h"
 #include "pixfmt.h"
+#include "version.h"
 
 typedef struct AVComponentDescriptor {
     /**
@@ -34,16 +35,16 @@ typedef struct AVComponentDescriptor {
     int plane;
 
     /**
-     * Number of elements between 2 horizontally consecutive pixels minus 1.
+     * Number of elements between 2 horizontally consecutive pixels.
      * Elements are bits for bitstream formats, bytes otherwise.
      */
-    int step_minus1;
+    int step;
 
     /**
-     * Number of elements before the component of the first pixel plus 1.
+     * Number of elements before the component of the first pixel.
      * Elements are bits for bitstream formats, bytes otherwise.
      */
-    int offset_plus1;
+    int offset;
 
     /**
      * Number of least significant bits that must be shifted away
@@ -52,9 +53,20 @@ typedef struct AVComponentDescriptor {
     int shift;
 
     /**
-     * Number of bits in the component minus 1.
+     * Number of bits in the component.
      */
-    int depth_minus1;
+    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;
 
 /**