X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavutil%2Fpixdesc.h;h=81b51b767f8fa5c2108fb233a720473b141ebdc9;hb=0181162bb54ce62ec212436a12d059726d8cd1df;hp=4f9c5a271fdea64325a8dbb7fe498c73c85a8195;hpb=f3881c04e93ee70567bd3fe087f49b996b026d30;p=ffmpeg

diff --git a/libavutil/pixdesc.h b/libavutil/pixdesc.h
index 4f9c5a271fd..81b51b767f8 100644
--- 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
@@ -343,7 +334,13 @@ char *av_get_pix_fmt_string(char *buf, int buf_size,
  * format writes the values corresponding to the palette
  * component c in data[1] to dst, rather than the palette indexes in
  * data[0]. The behavior is undefined if the format is not paletted.
+ * @param dst_element_size size of elements in dst array (2 or 4 byte)
  */
+void av_read_image_line2(void *dst, const uint8_t *data[4],
+                        const int linesize[4], const AVPixFmtDescriptor *desc,
+                        int x, int y, int c, int w, int read_pal_component,
+                        int dst_element_size);
+
 void av_read_image_line(uint16_t *dst, const uint8_t *data[4],
                         const int linesize[4], const AVPixFmtDescriptor *desc,
                         int x, int y, int c, int w, int read_pal_component);
@@ -361,7 +358,12 @@ void av_read_image_line(uint16_t *dst, const uint8_t *data[4],
  * @param y the vertical coordinate of the first pixel to write
  * @param w the width of the line to write, that is the number of
  * values to write to the image line
+ * @param src_element_size size of elements in src array (2 or 4 byte)
  */
+void av_write_image_line2(const void *src, uint8_t *data[4],
+                         const int linesize[4], const AVPixFmtDescriptor *desc,
+                         int x, int y, int c, int w, int src_element_size);
+
 void av_write_image_line(const uint16_t *src, uint8_t *data[4],
                          const int linesize[4], const AVPixFmtDescriptor *desc,
                          int x, int y, int c, int w);