comparison bmp.c @ 4415:f792b146869b libavcodec

Segregate code common to BMP decoder and future encoder patch by Michel Bardiaux, mbardiaux mediaxim be

4414:7c42c51b1130

/*
 * BMP image format
 * Copyright (c) 2005 Mans Rullgard
 *
 * This file is part of FFmpeg.
 *
 * FFmpeg is free software; you can redistribute it and/or

 */

#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;

#define read16(bits) bswap_16(get_bits(bits, 16))
#define read32(bits) bswap_32(get_bits_long(bits, 32))

static int bmp_decode_init(AVCodecContext *avctx){

4415:f792b146869b

/*
 * BMP image format decoder
 * Copyright (c) 2005 Mans Rullgard
 *
 * This file is part of FFmpeg.
 *
 * FFmpeg is free software; you can redistribute it and/or

 */

#include "avcodec.h"
#include "bitstream.h"
#include "bswap.h"
#include "bmp.h"

#define read16(bits) bswap_16(get_bits(bits, 16))
#define read32(bits) bswap_32(get_bits_long(bits, 32))

static int bmp_decode_init(AVCodecContext *avctx){