[MPlayer-cvslog] CVS: main/libmpcodecs vd_ffmpeg.c, 1.136, 1.137 ve_lavc.c, 1.104, 1.105

[Loren Merritt CVS]

CVS change done by Loren Merritt CVS

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var2/tmp/cvs-serv2136/libmpcodecs

Modified Files:
	vd_ffmpeg.c ve_lavc.c 
Log Message:
new lavc codec: ffvhuff


Index: vd_ffmpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_ffmpeg.c,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- vd_ffmpeg.c	11 Oct 2004 16:23:20 -0000	1.136
+++ vd_ffmpeg.c	28 Nov 2004 18:37:49 -0000	1.137
@@ -314,6 +314,7 @@
 	(sh->format == mmioFOURCC('M','4','S','2') ||
 	 sh->format == mmioFOURCC('M','P','4','S') ||
 	 sh->format == mmioFOURCC('H','F','Y','U') ||
+	 sh->format == mmioFOURCC('F','F','V','H') ||
 	 sh->format == mmioFOURCC('W','M','V','2') ||
 	 sh->format == mmioFOURCC('A','S','V','1') ||
 	 sh->format == mmioFOURCC('A','S','V','2') ||

Index: ve_lavc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_lavc.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- ve_lavc.c	18 Oct 2004 12:26:45 -0000	1.104
+++ ve_lavc.c	28 Nov 2004 18:37:49 -0000	1.105
@@ -932,7 +932,8 @@
 	memset(mux_v->bih, 0, sizeof(BITMAPINFOHEADER)+28);
 	mux_v->bih->biSize=sizeof(BITMAPINFOHEADER)+28;
     }
-    else if (lavc_param_vcodec && !strcasecmp(lavc_param_vcodec, "huffyuv"))
+    else if (lavc_param_vcodec && (!strcasecmp(lavc_param_vcodec, "huffyuv")
+                                || !strcasecmp(lavc_param_vcodec, "ffvhuff")))
     {
     /* XXX: hack: huffyuv needs to store huffman tables (allthough we dunno the size yet ...) */
 	mux_v->bih=malloc(sizeof(BITMAPINFOHEADER)+1000);
@@ -997,6 +998,8 @@
 	mux_v->bih->biCompression = mmioFOURCC('W', 'M', 'V', '2');
     else if (!strcasecmp(lavc_param_vcodec, "huffyuv"))
 	mux_v->bih->biCompression = mmioFOURCC('H', 'F', 'Y', 'U');
+    else if (!strcasecmp(lavc_param_vcodec, "ffvhuff"))
+	mux_v->bih->biCompression = mmioFOURCC('F', 'F', 'V', 'H');
     else if (!strcasecmp(lavc_param_vcodec, "asv1"))
 	mux_v->bih->biCompression = mmioFOURCC('A', 'S', 'V', '1');
     else if (!strcasecmp(lavc_param_vcodec, "asv2"))