#include "avcodec.h"
#include "bytestream.h"
#include "bmp.h"
+#include <assert.h>
static const uint32_t monoblack_pal[] = { 0x000000, 0xFFFFFF };
static const uint32_t rgb565_masks[] = { 0xF800, 0x07E0, 0x001F };
AVFrame * const p= (AVFrame*)&s->picture;
int n_bytes_image, n_bytes_per_row, n_bytes, i, n, hsize;
const uint32_t *pal = NULL;
+ uint32_t palette256[256];
int pad_bytes_per_row, pal_entries = 0, compression = BMP_RGB;
int bit_count = avctx->bits_per_coded_sample;
uint8_t *ptr;
case PIX_FMT_RGB4_BYTE:
case PIX_FMT_BGR4_BYTE:
case PIX_FMT_GRAY8:
- ff_set_systematic_pal2((uint32_t*)p->data[1], avctx->pix_fmt);
+ assert(bit_count == 8);
+ ff_set_systematic_pal2(palette256, avctx->pix_fmt);
+ pal = palette256;
+ break;
case PIX_FMT_PAL8:
pal = (uint32_t *)p->data[1];
break;
#include "avcodec.h"
#include "bytestream.h"
+#include "libavutil/imgutils.h"
typedef struct PCXContext {
AVFrame picture;
int bpp, nplanes, i, y, line_bytes, written;
const uint32_t *pal = NULL;
+ uint32_t palette256[256];
const uint8_t *src;
*pict = *(AVFrame *)data;
case PIX_FMT_RGB4_BYTE:
case PIX_FMT_BGR4_BYTE:
case PIX_FMT_GRAY8:
+ bpp = 8;
+ nplanes = 1;
+ ff_set_systematic_pal2(palette256, avctx->pix_fmt);
+ pal = palette256;
+ break;
case PIX_FMT_PAL8:
bpp = 8;
nplanes = 1;