Mercurial > mplayer.hg

annotate gui/bitmap.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 b0a7b35b78d2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
26029
4129c8cfa742 Add MPLAYER_ prefix to multiple inclusion guards.
diego
parents: 25607
diff changeset
1 #ifndef MPLAYER_GUI_BITMAP_H
4129c8cfa742 Add MPLAYER_ prefix to multiple inclusion guards.
diego
parents: 25607
diff changeset
2 #define MPLAYER_GUI_BITMAP_H
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
3
25607
9d0b189ce1b2 Fix illegal identifiers: Names starting with __ or _ and uppercase are reserved
diego
parents: 23689
diff changeset
4 typedef struct txSample
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
5 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
6 unsigned long Width;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
7 unsigned long Height;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
8 unsigned int BPP;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
9 unsigned long ImageSize;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
10 char * Image;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
11 } txSample;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
12
23194
41bbba7c3850 Remove useless extern before function prototypes
reimar
parents: 23077
diff changeset
13 int bpRead( char * fname, txSample * bf );
41bbba7c3850 Remove useless extern before function prototypes
reimar
parents: 23077
diff changeset
14 void Convert32to1( txSample * in,txSample * out,int adaptivlimit );
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
15
26029
4129c8cfa742 Add MPLAYER_ prefix to multiple inclusion guards.
diego
parents: 25607
diff changeset
16 #endif /* MPLAYER_GUI_BITMAP_H */