[Scummvm-cvs-logs] SF.net SVN: scummvm:[46499] tools/branches/gsoc2009-gui

[fingolfin at users.sourceforge.net]

Revision: 46499
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46499&view=rev
Author:   fingolfin
Date:     2009-12-23 14:15:12 +0000 (Wed, 23 Dec 2009)

Log Message:
-----------
cleanup

Modified Paths:
--------------
    tools/branches/gsoc2009-gui/compress.cpp
    tools/branches/gsoc2009-gui/compress.h

Modified: tools/branches/gsoc2009-gui/compress.cpp
===================================================================
--- tools/branches/gsoc2009-gui/compress.cpp	2009-12-23 14:04:30 UTC (rev 46498)
+++ tools/branches/gsoc2009-gui/compress.cpp	2009-12-23 14:15:12 UTC (rev 46499)
@@ -27,6 +27,14 @@
 
 #include "compress.h"
 
+#ifndef DISABLE_BUILTIN_VORBIS
+#include <vorbis/vorbisenc.h>
+#endif
+#ifndef DISABLE_BUILTIN_FLAC
+#define FLAC__NO_DLL 1
+#include <FLAC/stream_encoder.h>
+#endif
+
 struct lameparams {
 	uint32 minBitr;
 	uint32 maxBitr;

Modified: tools/branches/gsoc2009-gui/compress.h
===================================================================
--- tools/branches/gsoc2009-gui/compress.h	2009-12-23 14:04:30 UTC (rev 46498)
+++ tools/branches/gsoc2009-gui/compress.h	2009-12-23 14:15:12 UTC (rev 46499)
@@ -25,13 +25,6 @@
 
 #include "tool.h"
 
-#ifndef DISABLE_BUILTIN_VORBIS
-#include <vorbis/vorbisenc.h>
-#endif
-#ifndef DISABLE_BUILTIN_FLAC
-#define FLAC__NO_DLL 1
-#include <FLAC/stream_encoder.h>
-#endif
 
 enum {
 	/* These are the defaults parameters for the Lame invocation */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.