|
|
@ -115,7 +115,7 @@ static int raw_decode(AVCodecContext *avctx, |
|
|
|
frame->interlaced_frame = avctx->coded_frame->interlaced_frame; |
|
|
|
frame->interlaced_frame = avctx->coded_frame->interlaced_frame; |
|
|
|
frame->top_field_first = avctx->coded_frame->top_field_first; |
|
|
|
frame->top_field_first = avctx->coded_frame->top_field_first; |
|
|
|
|
|
|
|
|
|
|
|
//4bpp raw in avi and mov (yes this is ugly ...)
|
|
|
|
//2bpp and 4bpp raw in avi and mov (yes this is ugly ...)
|
|
|
|
if((avctx->bits_per_coded_sample == 4 || avctx->bits_per_coded_sample == 2) && |
|
|
|
if((avctx->bits_per_coded_sample == 4 || avctx->bits_per_coded_sample == 2) && |
|
|
|
avctx->pix_fmt==PIX_FMT_PAL8 && |
|
|
|
avctx->pix_fmt==PIX_FMT_PAL8 && |
|
|
|
(!avctx->codec_tag || avctx->codec_tag == MKTAG('r','a','w',' '))){ |
|
|
|
(!avctx->codec_tag || avctx->codec_tag == MKTAG('r','a','w',' '))){ |
|
|
@ -123,10 +123,10 @@ static int raw_decode(AVCodecContext *avctx, |
|
|
|
uint8_t *dst = context->buffer + 256*4; |
|
|
|
uint8_t *dst = context->buffer + 256*4; |
|
|
|
buf_size = context->length - 256*4; |
|
|
|
buf_size = context->length - 256*4; |
|
|
|
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; |
|
|
|
dst[2*i+1]= buf[i]&15; |
|
|
|
dst[2*i+1]= buf[i]&15; |
|
|
|
} |
|
|
|
} |
|
|
|
} else |
|
|
|
} else |
|
|
|
for(i=0; 4*i+3 < buf_size; i++){ |
|
|
|
for(i=0; 4*i+3 < buf_size; i++){ |
|
|
|
dst[4*i+0]= buf[i]>>6; |
|
|
|
dst[4*i+0]= buf[i]>>6; |
|
|
|