[MPlayer-cvslog] r37454 - in trunk: etc/codecs.conf fmt-conversion.c libmpcodecs/img_format.h libmpcodecs/vd_ffmpeg.c libvo/vo_vdpau.c

[Roberto Togni]

On Sun, 23 Aug 2015 20:53:02 -0400
Josh <joshf87 at live.com> wrote:

> On 8/23/2015 16:38, rtogni wrote:
> > Author: rtogni
> > Date: Sun Aug 23 22:38:07 2015
> > New Revision: 37454
> >
> > Log:
> > Remove last traces of old ffmpeg vdpau api
> >
> > Main patch by Philip Langdale  philipl overt org
> > Small changes and codecs.conf by me
> >
> > Modified:
> >     trunk/etc/codecs.conf
> >     trunk/fmt-conversion.c
> >     trunk/libmpcodecs/img_format.h
> >     trunk/libmpcodecs/vd_ffmpeg.c
> >     trunk/libvo/vo_vdpau.c
> >
> 
> Needs a couple of fixes for MinGW, I changed '#ifdef CONFIG_VDPAU' to 
> '#if CONFIG_VDPAU':
> 
> Index: img_format.h
> ===================================================================
> --- img_format.h	(revision 37456)
> +++ img_format.h	(working copy)
> @@ -20,7 +20,7 @@
>   #define MPLAYER_IMG_FORMAT_H
> 
>   #include "config.h"
> -#ifdef CONFIG_VDPAU
> +#if CONFIG_VDPAU
>   #include <vdpau/vdpau.h>
>   #endif
> 
> 
> But then:
> gcc -MMD -MP -Wall -Wno-switch -Wno-parentheses -Wpointer-arith 
> -Wredundant-decls -Werror=format-security -Wno-format 
> -Wdisabled-optimization -Wno-pointer-sign -Wdeclaration-after-statement 
> -std=gnu99 -Werror-implicit-function-declaration -D_ISOC99_SOURCE -I. 
> -Iffmpeg -O4 -march=i486 -mtune=generic -pipe -ffast-math 
> -fomit-frame-pointer -fno-tree-vectorize -D_LARGEFILE_SOURCE 
> -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -I/sources/live555 
> -fno-common  -I/mingw32/include  -I/mingw32/include/  -I/mingw32/include 
> -I/mingw32/include/dvdcss  -I/mingw32/include/freetype2 -DZLIB_CONST 
> -I/mingw32/include/opus  -I/mingw32/include/bs2b  -I/mingw32/include 
> -I/mingw32/include/dvdcss  -c -o command.o command.c
> In file included from libvo/video_out.h:30:0,
>                   from command.c:43:
> ./libmpcodecs/img_format.h:308:5: error: unknown type name 'VdpVideoSurface'
>       VdpVideoSurface surface;
> 
> I put '#ifdef CONFIG_VDPAU' also to ignore it but not sure if that is a 
> proper fix.
Hi,
 thanks for reporting. should be fixed in r37457

Ciao,
 Roberto