diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2007-01-24 10:41:03 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2007-01-24 10:41:03 +0000 |
| commit | 3e997aa4253d14f498a765a7d19e812696646051 (patch) | |
| tree | 4af39c09031094bb5332ef3df8ce1b7e63d9230f /libavcodec/bmp.c | |
| parent | 2c160320280a80362507eb4ce5fe20dd399be93e (diff) | |
| download | ffmpeg-3e997aa4253d14f498a765a7d19e812696646051.tar.gz | |
enum
Originally committed as revision 7678 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/bmp.c')
| -rw-r--r-- | libavcodec/bmp.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libavcodec/bmp.c b/libavcodec/bmp.c index 2a4d83393e..b3d8e4b965 100644 --- a/libavcodec/bmp.c +++ b/libavcodec/bmp.c @@ -27,10 +27,12 @@ typedef struct BMPContext { AVFrame picture; } BMPContext; -#define BMP_RGB 0 -#define BMP_RLE8 1 -#define BMP_RLE4 2 -#define BMP_BITFIELDS 3 +typedef enum { + BMP_RGB=0, + BMP_RLE8, + BMP_RLE4, + BMP_BITFIELDS, +} BiCompression; #define read16(bits) bswap_16(get_bits(bits, 16)) #define read32(bits) bswap_32(get_bits_long(bits, 32)) @@ -55,7 +57,7 @@ static int bmp_decode_frame(AVCodecContext *avctx, unsigned int fsize, hsize; int width, height; unsigned int depth; - unsigned int comp; + BiCompression comp; unsigned int ihsize; int i, j, n, linesize; uint32_t rgb[3]; |