diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-25 18:37:37 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-25 18:37:37 +0000 |
| commit | 9b56c962e7ef2675a5ad0054bd7844928ed2a32d (patch) | |
| tree | 75ead7eb78b6322adaede3a5840ccbb028a10306 /Gui/mplayer/pb.c | |
| parent | 18d719d7f5e2a5525402ae0061dc8666814784a2 (diff) | |
| download | mpv-9b56c962e7ef2675a5ad0054bd7844928ed2a32d.tar.bz2 mpv-9b56c962e7ef2675a5ad0054bd7844928ed2a32d.tar.xz | |
Rename Gui/mplayer/mplayer.h to gmplayer.h, another file named mplayer.h
already exists, both get included at the same time in some files...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21243 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui/mplayer/pb.c')
| -rw-r--r-- | Gui/mplayer/pb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gui/mplayer/pb.c b/Gui/mplayer/pb.c index 01c0013136..14ea8d97cc 100644 --- a/Gui/mplayer/pb.c +++ b/Gui/mplayer/pb.c @@ -20,12 +20,12 @@ #include "../stream/stream.h" #include "../mixer.h" #include "../libvo/sub.h" -#include "../mplayer.h" #include "../libmpdemux/demuxer.h" #include "../libmpdemux/stheader.h" #include "../codec-cfg.h" +#include "gmplayer.h" #include "play.h" #include "widgets.h" #include "common.h" |