Mercurial > mplayer.hg

view libvo/geometry.h @ 26146:20a126aaa756

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ve_vfw.c: #include aviheader.h instead of wine avifmt.h Compilation was broken after libmpdemux/muxer.h started including libmpdemux/aviheader.h. ve_vfw.c included both muxer.h and loader/wine/avifmt.h, and the latter has definitions that conflict with aviheader.h ones. Fix by removing the avifmt.h include. I did not carefully check that changing the includes doesn't break any ve_vfw.c code. However it at least fixes compilation, and if the avifmt.h versions differ in some significant way then the code is fundamentally broken anyway: ve_vfw cannot use different versions of the avi struct definitions when it also uses shared muxer.h types (those must use the standard definitions to keep the type compatible with what's used in other files).
author uau
date Thu, 06 Mar 2008 01:57:26 +0000
parents 4129c8cfa742
children d97a607821f1
line wrap: on
line source

/* This file (C) Mark Zealey <mark@zealos.org 2002, released under GPL */
#ifndef MPLAYER_GEOMETRY_H
#define MPLAYER_GEOMETRY_H

extern char *vo_geometry;
extern int geometry_wh_changed;
extern int geometry_xy_changed;
int geometry(int *xpos, int *ypos, int *widw, int *widh, int scrw, int scrh);

#endif /* MPLAYER_GEOMETRY_H */