Fix compiling again

Conflicts:
	Makefile.nmake

diff --cc Makefile.nmake
index 3f9701437e2efc03ca5a013aa2bd1720df529080,62febcbe20208ec94aa48deefb191c723180bb81..8342d96e62c90ee43393e92539a1b07e77907b42
--- 1/Makefile.nmake
--- 2/Makefile.nmake
+++ b/Makefile.nmake
@@@ -17,7 -17,7 +17,11 @@@ CROSSLIBS 
  !include "objects.mk"
  
  
++<<<<<<< HEAD
 +OBJECTSWIN = winmain.o threadwin.o remotewin.o ledwin.o mtdwin.o videowin.o audiowin.o osdwin.o surfacewin.o dsallocator.o dssourcefilter.o dssourcepin.o wwinvideofilter.o wwinaudiofilter.o wwinmp3audiofilter.o wjpegsimple.o 
++=======
+ OBJECTSWIN = winmain.o threadwin.o remotewin.o ledwin.o mtdwin.o videowin.o audiowin.o osdwin.o surfacewin.o dsallocator.o dssourcefilter.o dssourcepin.o wwinvideofilter.o wwinaudiofilter.o wwinmp3audiofilter.o wjpegsimple.o mediafile.o
++>>>>>>> 4612f8232dc402bada10681545f690c47ef4493a
  
  OBJECTS = $(OBJECTS1) $(OBJECTSWIN)