diff options
| author | Diego Biurrun <diego@biurrun.de> | 2007-02-07 01:48:09 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-02-07 01:48:09 +0000 |
| commit | 71e445fca3ccc1285068386bf9858d180b0fecfc (patch) | |
| tree | 230f6ba62bf0a9af096cad7c2a7c332b066e2965 /libavformat/sgi.c | |
| parent | 917fa192c72e226ffaddefbe6661ec3c405156cf (diff) | |
| download | ffmpeg-71e445fca3ccc1285068386bf9858d180b0fecfc.tar.gz | |
Replace deprecated PIX_FMT names by the newer variants.
Originally committed as revision 7867 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/sgi.c')
| -rw-r--r-- | libavformat/sgi.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/sgi.c b/libavformat/sgi.c index 5adcb3791e..da6501b61e 100644 --- a/libavformat/sgi.c +++ b/libavformat/sgi.c @@ -101,7 +101,7 @@ static int read_uncompressed_sgi(const SGIInfo *si, for (z = 0; z < si->zsize; z++) { #ifndef WORDS_BIGENDIAN - /* rgba -> bgra for rgba32 on little endian cpus */ + /* rgba -> bgra for rgb32 on little endian cpus */ if (si->zsize == 4 && z != 3) chan_offset = 2 - z; else @@ -130,7 +130,7 @@ static int expand_rle_row(ByteIOContext *f, unsigned char *optr, int length = 0; #ifndef WORDS_BIGENDIAN - /* rgba -> bgra for rgba32 on little endian cpus */ + /* rgba -> bgra for rgb32 on little endian cpus */ if (pixelstride == 4 && chan_offset != 3) { chan_offset = 2 - chan_offset; } @@ -241,7 +241,7 @@ static int sgi_read(ByteIOContext *f, } else if (s->zsize == SGI_RGB) { info->pix_fmt = PIX_FMT_RGB24; } else if (s->zsize == SGI_RGBA) { - info->pix_fmt = PIX_FMT_RGBA32; + info->pix_fmt = PIX_FMT_RGB32; } else { return AVERROR_INVALIDDATA; } @@ -386,7 +386,7 @@ static int sgi_write(ByteIOContext *pb, AVImageInfo *info) si->dimension = SGI_MULTI_CHAN; si->zsize = SGI_RGB; break; - case PIX_FMT_RGBA32: + case PIX_FMT_RGB32: si->dimension = SGI_MULTI_CHAN; si->zsize = SGI_RGBA; break; @@ -408,7 +408,7 @@ static int sgi_write(ByteIOContext *pb, AVImageInfo *info) for (z = 0; z < si->zsize; z++) { #ifndef WORDS_BIGENDIAN - /* rgba -> bgra for rgba32 on little endian cpus */ + /* rgba -> bgra for rgb32 on little endian cpus */ if (si->zsize == 4 && z != 3) chan_offset = 2 - z; else @@ -451,7 +451,7 @@ AVImageFormat sgi_image_format = { "sgi,rgb,rgba,bw", sgi_probe, sgi_read, - (1 << PIX_FMT_GRAY8) | (1 << PIX_FMT_RGB24) | (1 << PIX_FMT_RGBA32), + (1 << PIX_FMT_GRAY8) | (1 << PIX_FMT_RGB24) | (1 << PIX_FMT_RGB32), #ifdef CONFIG_MUXERS sgi_write, #else |