Mercurial > mplayer.hg

annotate stream/cache2.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 7ee4ae1648e6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
26029
4129c8cfa742 Add MPLAYER_ prefix to multiple inclusion guards.
diego
parents: 25535
diff changeset
1 #ifndef MPLAYER_CACHE2_H
4129c8cfa742 Add MPLAYER_ prefix to multiple inclusion guards.
diego
parents: 25535
diff changeset
2 #define MPLAYER_CACHE2_H
19808
5385740067a1 * remove extern definitions of functions in .c files
attila
parents:
diff changeset
3
5385740067a1 * remove extern definitions of functions in .c files
attila
parents:
diff changeset
4 extern void cache_uninit(stream_t *s);
5385740067a1 * remove extern definitions of functions in .c files
attila
parents:
diff changeset
5
26029
4129c8cfa742 Add MPLAYER_ prefix to multiple inclusion guards.
diego
parents: 25535
diff changeset
6 #endif /* MPLAYER_CACHE2_H */