# HG changeset patch # User mru # Date 1278546102 0 # Node ID da1b5110dbd02d43263d81793fac1b1871baca1c # Parent d004c9e2aa409557a2c0645c42eeea2c9d56df79 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. diff -r d004c9e2aa40 -r da1b5110dbd0 pixdesc.c --- a/pixdesc.c Wed Jul 07 17:27:51 2010 +0000 +++ b/pixdesc.c Wed Jul 07 23:41:42 2010 +0000 @@ -24,7 +24,7 @@ #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) { AVComponentDescriptor comp= desc->comp[c]; @@ -65,7 +65,7 @@ } } -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) { AVComponentDescriptor comp = desc->comp[c]; diff -r d004c9e2aa40 -r da1b5110dbd0 pixdesc.h --- a/pixdesc.h Wed Jul 07 17:27:51 2010 +0000 +++ b/pixdesc.h Wed Jul 07 23:41:42 2010 +0000 @@ -108,7 +108,7 @@ * 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. */ -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); /** @@ -125,7 +125,7 @@ * @param w the width of the line to write, that is the number of * 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); /**