[XviD-devel] xvid (API4) + mencoder

[Martin Drab]

On Thu, 14 Aug 2003, Edouard Gomez wrote:

> Edouard Gomez (ed.gomez at free.fr) wrote:
> > In attachment you'll find the latest sources for mencoder and mplayer. I
> > think  you  already  know you  have  to  replace  the files  located  in
> > ${mplayer}/libmpcodecs with these ones.
> > 
> > The list of options has changed a bit so please read the configuration
> > array in the ve_xvid.c file. 
> 
> Ok the mail filter is very aggressive, the files are available here:
> http://ed.gomez.free.fr/vrac/mencoder-modules/

Hi,

I've checked the files and they need to be changed by the attached patch 
in order to compile with the latest CVS MPlayer.

Martin Drab

-------------- next part --------------
diff -Naur old/vd_xvid.c new/vd_xvid.c
--- old/vd_xvid.c	2003-08-14 20:03:31.000000000 +0200
+++ new/vd_xvid.c	2003-08-15 11:03:37.000000000 +0200
@@ -34,7 +34,7 @@
 #ifdef HAVE_XVID
 
 #include "vd_internal.h"
-#include "cfgparser.h"
+#include "m_option.h"
 
 #include <xvid.h>
 
@@ -44,7 +44,7 @@
 
 static int do_dr2 = 1;
 
-struct config xvid_dec_opts[] = {
+m_option_t xvid_dec_opts[] = {
 	{ "dr2", &do_dr2, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 	{ "nodr2", &do_dr2, CONF_TYPE_FLAG, 0, 1, 0, NULL},
 	{NULL, NULL, 0, 0, 0, 0, NULL}
diff -Naur old/ve_xvid.c new/ve_xvid.c
--- old/ve_xvid.c	2003-08-14 20:03:35.000000000 +0200
+++ new/ve_xvid.c	2003-08-15 11:07:34.000000000 +0200
@@ -52,7 +52,7 @@
 #include <stdarg.h>
 #include <limits.h>
 
-#include "cfgparser.h"
+#include "m_option.h"
 
 #define XVID_FIRST_PASS_FILENAME "xvid-twopass.stats"
 #define FINE (!0)
@@ -108,7 +108,7 @@
 static int cfg_vbr_min_key_interval = 0;
 static int cfg_vbr_container_frame_overhead = 0;
 
-struct config xvidencopts_conf[] =
+m_option_t xvidencopts_conf[] =
 {
 	/* Standard things mencoder should be able to treat directly */
 	{"bitrate", &cfg_bitrate, CONF_TYPE_INT, 0, 0, 0, NULL},