# HG changeset patch # User alex # Date 1008436340 0 # Node ID 21fc87d76300a87c6524624a49202cefc0af9c00 # Parent 7aed2edd99ab272b3af64c0e0523c6dc467745ed support for RGB/BGR modes (tested with raw and divx4) diff -r 7aed2edd99ab -r 21fc87d76300 mencoder.c --- a/mencoder.c Sat Dec 15 16:49:45 2001 +0000 +++ b/mencoder.c Sat Dec 15 17:12:20 2001 +0000 @@ -2,6 +2,7 @@ #define VCODEC_FRAMENO 1 #define VCODEC_DIVX4 2 #define VCODEC_RAW 3 +#define VCODEC_LIBAVCODEC 4 #define ACODEC_COPY 0 #define ACODEC_PCM 1 @@ -402,6 +403,7 @@ for(i=0;icodec->outfmt[i]; if(out_fmt==0xFFFFFFFF) continue; + if(IMGFMT_IS_RGB(out_fmt) || IMGFMT_IS_BGR(out_fmt)) break; if(out_fmt==IMGFMT_YV12) break; if(out_fmt==IMGFMT_I420) break; if(out_fmt==IMGFMT_IYUV) break; @@ -432,6 +434,12 @@ vo_image_ptr=vo_image; } +if (IMGFMT_IS_BGR(out_fmt)) + vo_image_ptr = vo_image = malloc(vo_w*vo_h*IMGFMT_BGR_DEPTH(out_fmt)/8); + +if (IMGFMT_IS_RGB(out_fmt)) + vo_image_ptr = vo_image = malloc(vo_w*vo_h*IMGFMT_RGB_DEPTH(out_fmt)/8); + if(!init_video(sh_video)){ mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_CouldntInitVideoCodec); exit(1);