virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

replaced progressive by interleaved

Browse Source 
Originally committed as revision 1807 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Fabrice Bellard 2003-04-21 21:18:15 +00:00
parent 0a05e4940b
commit 7e2e1abf6b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/avformat.h
View File

@ -7,7 +7,7 @@ extern "C" {
#define LIBAVFORMAT_VERSION_INT 0x000406 #define LIBAVFORMAT_VERSION_INT 0x000406
#define LIBAVFORMAT_VERSION "0.4.6" #define LIBAVFORMAT_VERSION "0.4.6"
#define LIBAVFORMAT_BUILD 4604 #define LIBAVFORMAT_BUILD 4605
#include "avcodec.h" #include "avcodec.h"
@ -219,12 +219,12 @@ typedef struct AVImageInfo {
enum PixelFormat pix_fmt; /* requested pixel format */ enum PixelFormat pix_fmt; /* requested pixel format */
int width; /* requested width */ int width; /* requested width */
int height; /* requested height */ 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 */ AVPicture pict; /* returned allocated image */
} AVImageInfo; } AVImageInfo;
/* AVImageFormat.flags field constants */ /* 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 { typedef struct AVImageFormat {
const char *name; const char *name;

6
libavformat/png.c
View File

@ -519,7 +519,7 @@ static int png_read(ByteIOContext *f,
/* init image info */ /* init image info */
info->width = s->width; info->width = s->width;
info->height = s->height; 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->channels = png_get_nb_channels(s->color_type);
s->bits_per_pixel = s->bit_depth * s->channels; 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; uint8_t *tmp_buf = NULL;
s->f = f; s->f = f;
is_progressive = info->progressive; is_progressive = info->interleaved;
switch(info->pix_fmt) { switch(info->pix_fmt) {
case PIX_FMT_RGBA32: case PIX_FMT_RGBA32:
bit_depth = 8; 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_RGBA32) | (1 << PIX_FMT_RGB24) | (1 << PIX_FMT_GRAY8) |
(1 << PIX_FMT_MONOBLACK) | (1 << PIX_FMT_PAL8), (1 << PIX_FMT_MONOBLACK) | (1 << PIX_FMT_PAL8),
png_write, png_write,
AVIMAGE_PROGRESSIVE, AVIMAGE_INTERLEAVED,
}; };
#endif #endif