Mercurial > libavformat.hg
changeset 115:af07cbf4f24a libavformat
replaced progressive by interleaved
| author | bellard |
|---|---|
| date | Mon, 21 Apr 2003 21:18:15 +0000 |
| parents | 3a17db1515e4 |
| children | 6026a7f8ff78 |
| files | avformat.h png.c |
| diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/avformat.h Mon Apr 21 14:39:52 2003 +0000 +++ b/avformat.h Mon Apr 21 21:18:15 2003 +0000 @@ -7,7 +7,7 @@ #define LIBAVFORMAT_VERSION_INT 0x000406 #define LIBAVFORMAT_VERSION "0.4.6" -#define LIBAVFORMAT_BUILD 4604 +#define LIBAVFORMAT_BUILD 4605 #include "avcodec.h" @@ -219,12 +219,12 @@ enum PixelFormat pix_fmt; /* requested pixel format */ int width; /* requested width */ int height; /* requested height */ - int progressive; /* image is progressive (e.g. interleaved GIF) */ + int interleaved; /* image is interleaved (e.g. interleaved GIF) */ AVPicture pict; /* returned allocated image */ } AVImageInfo; /* AVImageFormat.flags field constants */ -#define AVIMAGE_PROGRESSIVE 0x0001 /* image format support progressive output */ +#define AVIMAGE_INTERLEAVED 0x0001 /* image format support interleaved output */ typedef struct AVImageFormat { const char *name;
--- a/png.c Mon Apr 21 14:39:52 2003 +0000 +++ b/png.c Mon Apr 21 21:18:15 2003 +0000 @@ -519,7 +519,7 @@ /* 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 @@ 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 @@ (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