sync branch with 1.2.3

Docs/Changelog_sm-ssc.txt

@@ -10,7 +10,7 @@ supported but exist anyways.)
 _____________________________________________________________________________
 
 ================================================================================
-sm-ssc v1.2.3 | 201103??
+sm-ssc v1.2.3 | 20110323
 --------------------------------------------------------------------------------
 
 20110309

Themes/default/Graphics/CombinedLifeMeterTug stream p1.redir

@@ -1 +0,0 @@
-_CombinedLifeMeterTug stream p1

Themes/default/Graphics/CombinedLifeMeterTug stream p2.redir

@@ -1 +0,0 @@
-_CombinedLifeMeterTug stream p2

Xcode/Info-StepMania.plist

@@ -50,7 +50,7 @@
 	<key>LSMinimumSystemVersion</key>
 	<string>10.4.10</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 2001-2010</string>
+	<string>Copyright 2001-2011</string>
 	<key>NSPrincipalClass</key>
 	<string>SMApplication</string>
 </dict>

src/ProductInfo.h

@@ -35,7 +35,7 @@
  * </li></ul>
  */
 #ifndef PRODUCT_VER_BARE
-#define PRODUCT_VER_BARE v1.2.2
+#define PRODUCT_VER_BARE v1.2.3
 #endif
 
 /**

src/ProductInfo.inc

@@ -5,7 +5,7 @@
 
 ; see ProductInfo.h for use descriptions
 !define PRODUCT_ID "sm-ssc"
-!define PRODUCT_VER "v1.2.2"
+!define PRODUCT_VER "v1.2.3"
 !define PRODUCT_DISPLAY "${PRODUCT_ID} ${PRODUCT_VER}"
 !define PRODUCT_BITMAP "ssc"
 

src/StepMania-net2008.vcproj

@@ -1488,7 +1488,6 @@
 				RelativePath="NotesWriterSSC.h"
 				>
 			</File>
-
 			<File
 				RelativePath="NoteTypes.cpp"
 				>

src/arch/MovieTexture/MovieTexture_FFMpeg.cpp

@@ -28,6 +28,7 @@ namespace avcodec
 #endif
 };
 
+/*
 #if defined(_MSC_VER) && !defined(XBOX)
 	#pragma comment(lib, "ffmpeg/lib/avcodec.lib")
 	#pragma comment(lib, "ffmpeg/lib/avformat.lib")
@@ -35,6 +36,7 @@ namespace avcodec
 		#pragma comment(lib, "ffmpeg/lib/swscale.lib")
 	#endif
 #endif // _MSC_VER && !XBOX
+*/
 
 #if defined(XBOX)
 	/* NOTES: ffmpeg static libraries arent included in SVN. You have to build