Mercurial > mplayer.hg

diff libmpcodecs/vd_divx4.c @ 9300:32be26de0d7c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanup detection of various divx4 versions/alternatives allows mixing xvid with divx4/5linux libs basic rule: -vfm odivx/divx4 and -ovc divx4 uses divx4/5linux/opendivx if available, otherwise uses xvid (if divx4.h is available and xvid has decore()/encore() functions). based on patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
author arpi
date Thu, 06 Feb 2003 20:24:14 +0000
parents 1eadce15446c
children d275152390ee
line wrap: on
line diff
--- a/libmpcodecs/vd_divx4.c	Thu Feb 06 20:18:59 2003 +0000
+++ b/libmpcodecs/vd_divx4.c	Thu Feb 06 20:24:14 2003 +0000
@@ -14,19 +14,27 @@
 
 static vd_info_t info = {
 #ifdef DECORE_DIVX5
-	"DivX5Linux lib (divx4 mode)",
+	"DivX5Linux lib",
 #else
-	"DivX4Linux lib (divx4 mode)",
+#ifdef DECORE_XVID
+	"XviD lib (divx4 compat.)",
+#else
+	"DivX4Linux lib",
+#endif
 #endif
 	"divx4",
 	"A'rpi",
+#ifdef DECORE_XVID
+	"http://www.xvid.com",
+#else
 	"http://www.divx.com",
+#endif
 	"native binary codec"
 };
 
 LIBVD_EXTERN(divx4)
 
-#ifdef HAVE_DIVX4_H
+#ifdef DECORE_XVID
 #include <divx4.h>
 #else
 #include <decore.h>