# HG changeset patch
# User lorenm
# Date 1101667069 0
# Node ID 633a4ed68311e594979163216932cb5fe80f27b1
# Parent  a2a7702a9e9dc2deecce128ab45a2187e06e74cc
new lavc codec: ffvhuff

diff -r a2a7702a9e9d -r 633a4ed68311 etc/codecs.conf
--- a/etc/codecs.conf	Sun Nov 28 10:18:01 2004 +0000
+++ b/etc/codecs.conf	Sun Nov 28 18:37:49 2004 +0000
@@ -294,7 +294,7 @@
 videocodec ffhuffyuv
   info "FFmpeg HuffYUV"
   status working
-  fourcc HFYU
+  fourcc HFYU,FFVH
   driver ffmpeg
   dll huffyuv
   out YUY2,422P,YV12
diff -r a2a7702a9e9d -r 633a4ed68311 libmpcodecs/vd_ffmpeg.c
--- a/libmpcodecs/vd_ffmpeg.c	Sun Nov 28 10:18:01 2004 +0000
+++ b/libmpcodecs/vd_ffmpeg.c	Sun Nov 28 18:37:49 2004 +0000
@@ -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') ||
diff -r a2a7702a9e9d -r 633a4ed68311 libmpcodecs/ve_lavc.c
--- a/libmpcodecs/ve_lavc.c	Sun Nov 28 10:18:01 2004 +0000
+++ b/libmpcodecs/ve_lavc.c	Sun Nov 28 18:37:49 2004 +0000
@@ -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"))