Commit ce1cd1cb authored by Stefano Sabatini's avatar Stefano Sabatini Committed by Måns Rullgård

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
parent 26784384
...@@ -90,13 +90,13 @@ static void draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir) ...@@ -90,13 +90,13 @@ static void draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir)
int y1 = c == 1 || c == 2 ? y>>priv->pix_desc->log2_chroma_h : y; int y1 = c == 1 || c == 2 ? y>>priv->pix_desc->log2_chroma_h : y;
for (i = y1; i < y1 + h1; i++) { for (i = y1; i < y1 + h1; i++) {
read_line(priv->line, av_read_image_line(priv->line,
inpic->data, inpic->data,
inpic->linesize, inpic->linesize,
priv->pix_desc, priv->pix_desc,
0, i, c, w1, 0); 0, i, c, w1, 0);
write_line(priv->line, av_write_image_line(priv->line,
outpic->data, outpic->data,
outpic->linesize, outpic->linesize,
priv->pix_desc, priv->pix_desc,
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include "intreadwrite.h" #include "intreadwrite.h"
void read_line(uint16_t *dst, const uint8_t *data[4], const int linesize[4], 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) const AVPixFmtDescriptor *desc, int x, int y, int c, int w, int read_pal_component)
{ {
AVComponentDescriptor comp= desc->comp[c]; 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,7 +65,7 @@ void read_line(uint16_t *dst, const uint8_t *data[4], const int linesize[4],
} }
} }
void write_line(const uint16_t *src, uint8_t *data[4], const int linesize[4], 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) const AVPixFmtDescriptor *desc, int x, int y, int c, int w)
{ {
AVComponentDescriptor comp = desc->comp[c]; AVComponentDescriptor comp = desc->comp[c];
......
...@@ -108,7 +108,7 @@ extern const AVPixFmtDescriptor av_pix_fmt_descriptors[]; ...@@ -108,7 +108,7 @@ extern const AVPixFmtDescriptor av_pix_fmt_descriptors[];
* component c in data[1] to dst, rather than the palette indexes in * 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. * data[0]. The behavior is undefined if the format is not paletted.
*/ */
void read_line(uint16_t *dst, const uint8_t *data[4], const int linesize[4], 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); const AVPixFmtDescriptor *desc, int x, int y, int c, int w, int read_pal_component);
/** /**
...@@ -125,7 +125,7 @@ void read_line(uint16_t *dst, const uint8_t *data[4], const int linesize[4], ...@@ -125,7 +125,7 @@ void read_line(uint16_t *dst, const uint8_t *data[4], const int linesize[4],
* @param w the width of the line to write, that is the number of * @param w the width of the line to write, that is the number of
* values to write to the image line * values to write to the image line
*/ */
void write_line(const uint16_t *src, uint8_t *data[4], const int linesize[4], 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); const AVPixFmtDescriptor *desc, int x, int y, int c, int w);
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment