replaced progressive by interleaved

Originally committed as revision 1807 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 9e40145265cb6e4f26e64f5edd7f53392c3f3353..ffe1d67be166b7f20568266b9ebd24aa59ee3f10 100644 (file)
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -7,7 +7,7 @@ extern "C" {
 
 #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 @@ typedef struct AVImageInfo {
     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;

diff --git a/libavformat/png.c b/libavformat/png.c
index a04441469cae9d67fbe9d2e64f655244d5f62cd6..179f9c7f4ff7bc6c52f814bd10c322ce13312970 100644 (file)
--- 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