Originally committed as revision 24126 to svn://svn.ffmpeg.org/ffmpeg/trunktags/n0.8
@@ -91,16 +91,16 @@ static void draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir) | |||||
for (i = y1; i < y1 + h1; i++) { | for (i = y1; i < y1 + h1; i++) { | ||||
av_read_image_line(priv->line, | av_read_image_line(priv->line, | ||||
inpic->data, | |||||
inpic->linesize, | |||||
priv->pix_desc, | |||||
0, i, c, w1, 0); | |||||
inpic->data, | |||||
inpic->linesize, | |||||
priv->pix_desc, | |||||
0, i, c, w1, 0); | |||||
av_write_image_line(priv->line, | av_write_image_line(priv->line, | ||||
outpic->data, | |||||
outpic->linesize, | |||||
priv->pix_desc, | |||||
0, i, c, w1); | |||||
outpic->data, | |||||
outpic->linesize, | |||||
priv->pix_desc, | |||||
0, i, c, w1); | |||||
} | } | ||||
} | } | ||||
@@ -25,7 +25,7 @@ | |||||
#include "intreadwrite.h" | #include "intreadwrite.h" | ||||
void av_read_image_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]; | ||||
int plane= comp.plane; | int plane= comp.plane; | ||||
@@ -66,7 +66,7 @@ void av_read_image_line(uint16_t *dst, const uint8_t *data[4], const int linesiz | |||||
} | } | ||||
void av_write_image_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]; | ||||
int plane = comp.plane; | int plane = comp.plane; | ||||
@@ -109,7 +109,7 @@ extern const AVPixFmtDescriptor av_pix_fmt_descriptors[]; | |||||
* 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 av_read_image_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); | |||||
/** | /** | ||||
* Write the values from src to the pixel format component c of an | * Write the values from src to the pixel format component c of an | ||||
@@ -126,7 +126,7 @@ void av_read_image_line(uint16_t *dst, const uint8_t *data[4], const int linesiz | |||||
* values to write to the image line | * values to write to the image line | ||||
*/ | */ | ||||
void av_write_image_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); | |||||
/** | /** | ||||
* Return the pixel format corresponding to name. | * Return the pixel format corresponding to name. | ||||