[MPlayer-dev-eng] [PATCH] fix compilation of libvo/vo_xvmc.c

[Erik Auerswald]

Hi,

since svn revision 22812 the wrong xvmc_render.h file is included in
libvo/vo_xvmc.c, which breaks compilation. The following patch fixes this:

Index: mpcommon.mak
===================================================================
--- mpcommon.mak        (revision 22818)
+++ mpcommon.mak        (working copy)
@@ -8,7 +8,7 @@
 
 CFLAGS-$(CONFIG_LIBAVCODEC)     += -I../libavcodec
 CFLAGS-$(CONFIG_LIBAVFORMAT)    += -I../libavformat
-CFLAGS += $(CFLAGS-yes) $(OPTFLAGS)
+CFLAGS += $(OPTFLAGS) $(CFLAGS-yes) 
 
 LIBS-$(MPLAYER)  += $(LIBNAME_MPLAYER)
 LIBS-$(MENCODER) += $(LIBNAME_MENCODER)

A better way would be to svn rename xvmc_render.h to mp_xvmc_render.h
and use the following patch:

Index: libvo/vo_xvmc.c
===================================================================
--- libvo/vo_xvmc.c     (revision 22818)
+++ libvo/vo_xvmc.c     (working copy)
@@ -25,7 +25,7 @@
 #include <X11/extensions/XvMClib.h>
 
 #include "x11_common.h"
-#include "xvmc_render.h"
+#include "mp_xvmc_render.h"
 
 #include "sub.h"
 #include "aspect.h"

An even better way might be to join xvmc_render.h and
libavcodec/xvmc_render.h and keep just the libavcodec one.

Erik
-- 
Specialization is for insects.
                        -- Robert Heinlein