1. ffmpeg
  2. Commit ce1cd1cba2d15b5b899235217fea3929a8f01892
Browse code

Rename read/write_line() to av_read/write_image_line().

The old names were not av_ prefixed, and they were causing linking
failure on many platforms. The new names are also more descriptive.

Patch by Stefano Sabatini.

Originally committed as revision 24101 to svn://svn.ffmpeg.org/ffmpeg/trunk

Stefano Sabatini authored on 2010/07/08 08:41:42
Showing 3 changed files
libavfilter/vf_pixdesctest.c
History View file @ ce1cd1c
... ... 
@@ -90,13 +90,13 @@ static void draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir)
90 90 
         int y1 = c == 1 || c == 2 ? y>>priv->pix_desc->log2_chroma_h : y;
91 91
92 92 
         for (i = y1; i < y1 + h1; i++) {
93 
-            read_line(priv->line,
93 
+            av_read_image_line(priv->line,
94 94 
                       inpic->data,
95 95 
                       inpic->linesize,
96 96 
                       priv->pix_desc,
97 97 
                       0, i, c, w1, 0);
98 98
99 
-            write_line(priv->line,
99 
+            av_write_image_line(priv->line,
100 100 
                        outpic->data,
101 101 
                        outpic->linesize,
102 102 
                        priv->pix_desc,
libavutil/pixdesc.c
History View file @ ce1cd1c
... ... 
@@ -24,7 +24,7 @@
24 24
25 25 
 #include "intreadwrite.h"
26 26
27 
-void read_line(uint16_t *dst, const uint8_t *data[4], const int linesize[4],
27 
+void av_read_image_line(uint16_t *dst, const uint8_t *data[4], const int linesize[4],
28 28 
                const AVPixFmtDescriptor *desc, int x, int y, int c, int w, int read_pal_component)
29 29 
 {
30 30 
     AVComponentDescriptor comp= desc->comp[c];
... ... 
@@ -65,7 +65,7 @@ void read_line(uint16_t *dst, const uint8_t *data[4], const int linesize[4],
65 65 
     }
66 66 
 }
67 67
68 
-void write_line(const uint16_t *src, uint8_t *data[4], const int linesize[4],
68 
+void av_write_image_line(const uint16_t *src, uint8_t *data[4], const int linesize[4],
69 69 
                 const AVPixFmtDescriptor *desc, int x, int y, int c, int w)
70 70 
 {
71 71 
     AVComponentDescriptor comp = desc->comp[c];
libavutil/pixdesc.h
History View file @ ce1cd1c
... ... 
@@ -108,7 +108,7 @@ extern const AVPixFmtDescriptor av_pix_fmt_descriptors[];
108 108 
  * component c in data[1] to dst, rather than the palette indexes in
109 109 
  * data[0]. The behavior is undefined if the format is not paletted.
110 110 
  */
111 
-void read_line(uint16_t *dst, const uint8_t *data[4], const int linesize[4],
111 
+void av_read_image_line(uint16_t *dst, const uint8_t *data[4], const int linesize[4],
112 112 
                const AVPixFmtDescriptor *desc, int x, int y, int c, int w, int read_pal_component);
113 113
114 114 
 /**
... ... 
@@ -125,7 +125,7 @@ void read_line(uint16_t *dst, const uint8_t *data[4], const int linesize[4],
125 125 
  * @param w the width of the line to write, that is the number of
126 126 
  * values to write to the image line
127 127 
  */
128 
-void write_line(const uint16_t *src, uint8_t *data[4], const int linesize[4],
128 
+void av_write_image_line(const uint16_t *src, uint8_t *data[4], const int linesize[4],
129 129 
                 const AVPixFmtDescriptor *desc, int x, int y, int c, int w);
130 130
131 131 
 /**