summaryrefslogtreecommitdiff
path: root/libavcodec/bmp.c
diff options
context:
space:
mode:
authorMichel Bardiaux <mbardiaux@peaktime.be>2007-01-27 07:39:16 +0000
committerDiego Biurrun <diego@biurrun.de>2007-01-27 07:39:16 +0000
commit76ebb18f1679ee48e6d280b39467a643e1e7d68e (patch)
treef33623ff8f4c7f0b921f7ed66e36c31e605e829c /libavcodec/bmp.c
parent74fd63d009cbf60a5fdfa6a0724508b87dd42347 (diff)
Segregate code common to BMP decoder and future encoder
patch by Michel Bardiaux, mbardiaux mediaxim be Originally committed as revision 7721 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/bmp.c')
-rw-r--r--libavcodec/bmp.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/libavcodec/bmp.c b/libavcodec/bmp.c
index f286aebecf..e621c68ea9 100644
--- a/libavcodec/bmp.c
+++ b/libavcodec/bmp.c
@@ -1,5 +1,5 @@
/*
- * BMP image format
+ * BMP image format decoder
* Copyright (c) 2005 Mans Rullgard
*
* This file is part of FFmpeg.
@@ -22,17 +22,7 @@
#include "avcodec.h"
#include "bitstream.h"
#include "bswap.h"
-
-typedef struct BMPContext {
- AVFrame picture;
-} BMPContext;
-
-typedef enum {
- BMP_RGB =0,
- BMP_RLE8 =1,
- BMP_RLE4 =2,
- BMP_BITFIELDS =3,
-} BiCompression;
+#include "bmp.h"
#define read16(bits) bswap_16(get_bits(bits, 16))
#define read32(bits) bswap_32(get_bits_long(bits, 32))