Index: C:/dev/trunk/third_party/live555/liveMedia/include/MediaLookupTable.hh
===================================================================
--- C:/dev/trunk/third_party/live555/liveMedia/include/MediaLookupTable.hh	(revision 0)
+++ C:/dev/trunk/third_party/live555/liveMedia/include/MediaLookupTable.hh	(revision 93311)
@@ -0,0 +1,35 @@
+#ifndef _MEDIA_LOOKUP_TABLE_HH
+#define _MEDIA_LOOKUP_TABLE_HH
+
+#ifndef _USAGE_ENVIRONMENT_HH
+#include "UsageEnvironment.hh"
+#endif
+
+class Medium;
+class HashTable;
+
+
+// A data structure for looking up a Medium by its string name
+class MediaLookupTable {
+public:
+  static MediaLookupTable* ourMedia(UsageEnvironment& env);
+
+  Medium* lookup(char const* name) const;
+      // Returns NULL if none already exists
+
+  void addNew(Medium* medium, char* mediumName);
+  void remove(char const* name);
+
+  void generateNewName(char* mediumName, unsigned maxLen);
+
+protected:
+  MediaLookupTable(UsageEnvironment& env);
+  virtual ~MediaLookupTable();
+
+private:
+  UsageEnvironment& fEnv;
+  HashTable* fTable;
+  unsigned fNameGenerator;
+};
+
+#endif
\ No newline at end of file
Index: C:/dev/trunk/third_party/live555/liveMedia/Media.cpp
===================================================================
--- C:/dev/trunk/third_party/live555/liveMedia/Media.cpp	(revision 93310)
+++ C:/dev/trunk/third_party/live555/liveMedia/Media.cpp	(revision 93311)
@@ -19,32 +19,9 @@
 // Implementation
 
 #include "Media.hh"
+#include "MediaLookupTable.hh"
 #include "HashTable.hh"
 
-// A data structure for looking up a Medium by its string name
-class MediaLookupTable {
-public:
-  static MediaLookupTable* ourMedia(UsageEnvironment& env);
-
-  Medium* lookup(char const* name) const;
-      // Returns NULL if none already exists
-
-  void addNew(Medium* medium, char* mediumName);
-  void remove(char const* name);
-
-  void generateNewName(char* mediumName, unsigned maxLen);
-
-protected:
-  MediaLookupTable(UsageEnvironment& env);
-  virtual ~MediaLookupTable();
-
-private:
-  UsageEnvironment& fEnv;
-  HashTable* fTable;
-  unsigned fNameGenerator;
-};
-
-
 ////////// Medium //////////
 
 Medium::Medium(UsageEnvironment& env)