# HG changeset patch # User diego # Date 1169883556 0 # Node ID f792b146869b96eeb5daf9dee2a7ee0698e6dc80 # Parent 7c42c51b113010095ce6887a6f93dcc94cbba03a Segregate code common to BMP decoder and future encoder patch by Michel Bardiaux, mbardiaux mediaxim be diff -r 7c42c51b1130 -r f792b146869b bmp.c --- a/bmp.c Sat Jan 27 06:57:11 2007 +0000 +++ b/bmp.c Sat Jan 27 07:39:16 2007 +0000 @@ -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)) diff -r 7c42c51b1130 -r f792b146869b bmp.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/bmp.h Sat Jan 27 07:39:16 2007 +0000 @@ -0,0 +1,31 @@ +/* + * internals for BMP codecs + * Copyright (c) 2005 Mans Rullgard + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +typedef struct BMPContext { + AVFrame picture; +} BMPContext; + +typedef enum { + BMP_RGB =0, + BMP_RLE8 =1, + BMP_RLE4 =2, + BMP_BITFIELDS =3, +} BiCompression;