generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rawdec: use AVPALETTE_SIZE instead of magic constants.

Browse Source
This commit is contained in:
Anton Khirnov
2013-01-03 17:19:01 +01:00
parent e6da5d215b
commit aec50f79e7
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/rawdec.c
View File

@@ -138,14 +138,15 @@ static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame,
frame->reordered_opaque = avctx->reordered_opaque; frame->reordered_opaque = avctx->reordered_opaque;
frame->pkt_pts = avctx->pkt->pts; frame->pkt_pts = avctx->pkt->pts;
if (buf_size < context->length - (avctx->pix_fmt == AV_PIX_FMT_PAL8 ? 256 * 4 : 0)) if (buf_size < context->length - (avctx->pix_fmt == AV_PIX_FMT_PAL8 ?
AVPALETTE_SIZE : 0))
return -1; return -1;
//2bpp and 4bpp raw in avi and mov (yes this is ugly ...) //2bpp and 4bpp raw in avi and mov (yes this is ugly ...)
if (context->buffer) { if (context->buffer) {
int i; int i;
uint8_t *dst = context->buffer; uint8_t *dst = context->buffer;
buf_size = context->length - 256 * 4; buf_size = context->length - AVPALETTE_SIZE;
if (avctx->bits_per_coded_sample == 4) { if (avctx->bits_per_coded_sample == 4) {
for (i = 0; 2 * i + 1 < buf_size; i++) { for (i = 0; 2 * i + 1 < buf_size; i++) {
dst[2 * i + 0] = buf[i] >> 4; dst[2 * i + 0] = buf[i] >> 4;