[Mplayer-cvslog] CVS: main/libmpcodecs ve_lavc.c,1.65,1.66

Michael Niedermayer CVS michael at mplayerhq.hu
Wed Jun 18 00:52:59 CEST 2003


Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var/tmp.root/cvs-serv4277/libmpcodecs

Modified Files:
	ve_lavc.c 
Log Message:
lossless ff mjpeg encoding


Index: ve_lavc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_lavc.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- ve_lavc.c	14 Jun 2003 01:26:06 -0000	1.65
+++ ve_lavc.c	17 Jun 2003 22:52:42 -0000	1.66
@@ -426,10 +426,13 @@
         lavc_venc_context->pix_fmt= PIX_FMT_YUV411P;
     else if(!strcasecmp(lavc_param_format, "YVU9"))
         lavc_venc_context->pix_fmt= PIX_FMT_YUV410P;
+    else if(!strcasecmp(lavc_param_format, "BGR32"))
+        lavc_venc_context->pix_fmt= PIX_FMT_RGBA32;
     else{
         mp_msg(MSGT_MENCODER,MSGL_ERR,"%s is not a supported format\n", lavc_param_format);
         return 0;
     }
+
     /* lavc internal 2pass bitrate control */
     switch(lavc_param_vpass){
     case 1: 
@@ -526,6 +529,10 @@
         if(!strcasecmp(lavc_param_format, "YVU9"))
             return VFCAP_CSP_SUPPORTED | VFCAP_ACCEPT_STRIDE;
         break;
+    case IMGFMT_BGR32:
+        if(!strcasecmp(lavc_param_format, "BGR32"))
+            return VFCAP_CSP_SUPPORTED | VFCAP_ACCEPT_STRIDE;
+        break;
     }
     return 0;
 }
@@ -707,6 +714,8 @@
 	mux_v->bih->biCompression = mmioFOURCC('R', 'V', '1', '0');
     else if (!strcasecmp(lavc_param_vcodec, "mjpeg"))
 	mux_v->bih->biCompression = mmioFOURCC('M', 'J', 'P', 'G');
+    else if (!strcasecmp(lavc_param_vcodec, "ljpeg"))
+	mux_v->bih->biCompression = mmioFOURCC('L', 'J', 'P', 'G');
     else if (!strcasecmp(lavc_param_vcodec, "mpeg4"))
 	mux_v->bih->biCompression = mmioFOURCC('D', 'I', 'V', 'X');
     else if (!strcasecmp(lavc_param_vcodec, "msmpeg4"))



More information about the MPlayer-cvslog mailing list