sync branch with 1.2.3

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

@@ -1480,15 +1480,14 @@
 				RelativePath="NotesWriterSM.h"
 				>
 			</File>
-                        <File
-                                RelativePath="NotesWriterSSC.cpp"
+			<File
+				RelativePath="NotesWriterSSC.cpp"
 				>
-                        </File>
-                        <File
-                                RelativePath="NotesWriterSSC.h"
+			</File>
+			<File
+				RelativePath="NotesWriterSSC.h"
 				>
-                        </File>
-
+			</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