summaryrefslogtreecommitdiffstats
path: root/mencoder.c
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-12-15 17:12:20 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-12-15 17:12:20 +0000
commit130c8667e1bd99284b2a2472eb061fad883c5e32 (patch)
tree42818fd0270814f369b537c1a030193b11aaad10 /mencoder.c
parent149f8a1265aa2e30d8b7085ba38ddbc465ff364e (diff)
downloadmpv-130c8667e1bd99284b2a2472eb061fad883c5e32.tar.bz2
mpv-130c8667e1bd99284b2a2472eb061fad883c5e32.tar.xz
support for RGB/BGR modes (tested with raw and divx4)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3505 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
-rw-r--r--mencoder.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/mencoder.c b/mencoder.c
index e03cbe1492..82ccc7ca76 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -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 @@ mp_msg(MSGT_MENCODER,MSGL_INFO,"%s video codec: [%s] drv:%d (%s)\n",video_codec?
for(i=0;i<CODECS_MAX_OUTFMT;i++){
out_fmt=sh_video->codec->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 @@ if(out_fmt==IMGFMT_YV12 || out_fmt==IMGFMT_I420 || out_fmt==IMGFMT_IYUV){
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);