highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

code is ok for 4bpp in mov too, fix 16grey.mov

Browse Source 
Originally committed as revision 12273 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier
2008-02-28 16:08:52 +00:00
parent 0de2157fa4
commit 83f02883df
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/rawdec.c
View File

@@ -46,6 +46,7 @@ static const PixelFormatTag pixelFormatBpsAVI[] = {
static const PixelFormatTag pixelFormatBpsMOV[] = { static const PixelFormatTag pixelFormatBpsMOV[] = {
/* FIXME fix swscaler to support those */ /* FIXME fix swscaler to support those */
/* http://developer.apple.com/documentation/QuickTime/QTFF/QTFFChap3/chapter_4_section_2.html */ /* http://developer.apple.com/documentation/QuickTime/QTFF/QTFFChap3/chapter_4_section_2.html */
{ PIX_FMT_PAL8, 4 },
{ PIX_FMT_PAL8, 8 }, { PIX_FMT_PAL8, 8 },
{ PIX_FMT_BGR555, 16 }, { PIX_FMT_BGR555, 16 },
{ PIX_FMT_RGB24, 24 }, { PIX_FMT_RGB24, 24 },
@@ -106,8 +107,9 @@ 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 (yes this is ugly ...) //4bpp raw in avi and mov (yes this is ugly ...)
if(avctx->bits_per_sample == 4 && avctx->pix_fmt==PIX_FMT_PAL8 && !avctx->codec_tag){ if(avctx->bits_per_sample == 4 && avctx->pix_fmt==PIX_FMT_PAL8 &&
!avctx->codec_tag || avctx->codec_tag == MKTAG('r','a','w',' ')){
int i; int i;
for(i=256*2; i+1 < context->length>>1; i++){ for(i=256*2; i+1 < context->length>>1; i++){
context->buffer[2*i+0]= buf[i-256*2]>>4; context->buffer[2*i+0]= buf[i-256*2]>>4;