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

[Diego Biurrun]

On Sun, Mar 25, 2007 at 03:37:00PM +0200, Erik Auerswald wrote:
> 
> 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:
> 
> --- mpcommon.mak        (revision 22818)
> +++ mpcommon.mak        (working copy)
> @@ -8,7 +8,7 @@
>  
> -CFLAGS += $(CFLAGS-yes) $(OPTFLAGS)
> +CFLAGS += $(OPTFLAGS) $(CFLAGS-yes) 

Unacceptable.

> A better way would be to svn rename xvmc_render.h to mp_xvmc_render.h
> and use the following patch:
> 
> --- libvo/vo_xvmc.c     (revision 22818)
> +++ libvo/vo_xvmc.c     (working copy)
> @@ -25,7 +25,7 @@
>  
>  #include "x11_common.h"
> -#include "xvmc_render.h"
> +#include "mp_xvmc_render.h"

Ugly but acceptable.

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

This is the correct solution.  Ivan?

Diego