diff options
| author | Fabrice Bellard <fabrice@bellard.org> | 2003-04-21 21:18:15 +0000 |
|---|---|---|
| committer | Fabrice Bellard <fabrice@bellard.org> | 2003-04-21 21:18:15 +0000 |
| commit | 7e2e1abf6b239f5d304dd42f5078498b68914667 (patch) | |
| tree | 1631aabc688ecac3b18231834bed47258f581df9 /libavformat/png.c | |
| parent | 0a05e4940bc6ae8bf66a7435e5cc994707e783b1 (diff) | |
replaced progressive by interleaved
Originally committed as revision 1807 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/png.c')
| -rw-r--r-- | libavformat/png.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/png.c b/libavformat/png.c index a04441469c..179f9c7f4f 100644 --- a/libavformat/png.c +++ b/libavformat/png.c @@ -519,7 +519,7 @@ static int png_read(ByteIOContext *f, /* init image info */ info->width = s->width; info->height = s->height; - info->progressive = (s->interlace_type != 0); + info->interleaved = (s->interlace_type != 0); s->channels = png_get_nb_channels(s->color_type); s->bits_per_pixel = s->bit_depth * s->channels; @@ -718,7 +718,7 @@ static int png_write(ByteIOContext *f, AVImageInfo *info) uint8_t *tmp_buf = NULL; s->f = f; - is_progressive = info->progressive; + is_progressive = info->interleaved; switch(info->pix_fmt) { case PIX_FMT_RGBA32: bit_depth = 8; @@ -882,6 +882,6 @@ AVImageFormat png_image_format = { (1 << PIX_FMT_RGBA32) | (1 << PIX_FMT_RGB24) | (1 << PIX_FMT_GRAY8) | (1 << PIX_FMT_MONOBLACK) | (1 << PIX_FMT_PAL8), png_write, - AVIMAGE_PROGRESSIVE, + AVIMAGE_INTERLEAVED, }; #endif |