From e57546de6faca13b3baba7ab96da3fdda8bd87d7 Mon Sep 17 00:00:00 2001
From: Valentin NOEL <valent.noel@gmail.com>
Date: Thu, 9 Oct 2014 18:55:37 +0200
Subject: [PATCH 01/13] Windows: fix static const members unresolved reference
 SWIG binding problem

---
 src/AvTranscoder/Profile.cpp                  | 16 ++++++-
 src/AvTranscoder/Profile.hpp                  | 48 +++++++++++++------
 src/AvTranscoder/avTranscoder.i               | 19 --------
 .../essenceStructures/AudioFrame.hpp          |  4 +-
 .../essenceStructures/VideoFrame.hpp          |  4 +-
 5 files changed, 52 insertions(+), 39 deletions(-)

diff --git a/src/AvTranscoder/Profile.cpp b/src/AvTranscoder/Profile.cpp
index d28df5e5..79d36b3e 100644
--- a/src/AvTranscoder/Profile.cpp
+++ b/src/AvTranscoder/Profile.cpp
@@ -18,12 +18,10 @@ namespace avtranscoder
 
 const std::string Profile::avProfileIdentificator( "avProfile" );
 const std::string Profile::avProfileIdentificatorHuman( "avProfileLong" );
-
 const std::string Profile::avProfileType( "avProfileType" );
 const std::string Profile::avProfileTypeFormat( "avProfileTypeFormat" );
 const std::string Profile::avProfileTypeVideo( "avProfileTypeVideo" );
 const std::string Profile::avProfileTypeAudio( "avProfileTypeAudio" );
-
 const std::string Profile::avProfileFormat( "format" );
 const std::string Profile::avProfileCodec( "codec" );
 const std::string Profile::avProfilePixelFormat( "pix_fmt" );
@@ -172,4 +170,18 @@ Profile::ProfileDesc& Profile::getProfile( const std::string& searchProfile )
 	throw std::runtime_error( "unable to find profile: " + searchProfile );
 }
 
+const std::string & Profile::getAvProfileIdentificatorKey() { return avProfileIdentificator; };
+const std::string & Profile::getAvProfileIdentificatorHumanKey() { return avProfileIdentificatorHuman; };
+const std::string & Profile::getAvProfileTypeKey() { return avProfileType; };
+const std::string & Profile::getAvProfileTypeFormatKey() { return avProfileTypeFormat; };
+const std::string & Profile::getAvProfileTypeVideoKey() { return avProfileTypeVideo; };
+const std::string & Profile::getAvProfileTypeAudioKey() { return avProfileTypeAudio; };
+const std::string & Profile::getAvProfileFormatKey() { return avProfileFormat; };
+const std::string & Profile::getAvProfileCodecKey() { return avProfileCodec; };
+const std::string & Profile::getAvProfilePixelFormatKey() { return avProfilePixelFormat; };
+const std::string & Profile::getAvProfileSampleFormatKey() { return avProfileSampleFormat; };
+const std::string & Profile::getAvProfileFrameRateKey() { return avProfileFrameRate; };
+const std::string & Profile::getAvProfileSampleRateKey() { return avProfileSampleRate; };
+const std::string & Profile::getAvProfileChannelKey() { return avProfileChannel; };
+
 }
diff --git a/src/AvTranscoder/Profile.hpp b/src/AvTranscoder/Profile.hpp
index 3e5b62b8..fcfa2faa 100644
--- a/src/AvTranscoder/Profile.hpp
+++ b/src/AvTranscoder/Profile.hpp
@@ -14,21 +14,7 @@ namespace avtranscoder
 class AvExport Profile
 {
 public:
-	static const std::string avProfileIdentificator;
-	static const std::string avProfileIdentificatorHuman;
-	static const std::string avProfileType;
 
-	static const std::string avProfileTypeFormat;
-	static const std::string avProfileTypeVideo;
-	static const std::string avProfileTypeAudio;
-	
-	static const std::string avProfileFormat;
-	static const std::string avProfileCodec;
-	static const std::string avProfilePixelFormat;
-	static const std::string avProfileSampleFormat;
-	static const std::string avProfileFrameRate;
-	static const std::string avProfileSampleRate;
-	static const std::string avProfileChannel;
 
 public:
 	// typedef std::pair< std::string, std::string > KeyDesc;
@@ -51,9 +37,43 @@ class AvExport Profile
 
 	ProfileDesc& getProfile( const std::string& searchProfile );
 
+	static const std::string & getAvProfileIdentificatorKey();
+	static const std::string & getAvProfileIdentificatorHumanKey();
+	static const std::string & getAvProfileTypeKey();
+	static const std::string & getAvProfileTypeFormatKey();
+	static const std::string & getAvProfileTypeVideoKey();
+	static const std::string & getAvProfileTypeAudioKey();
+	static const std::string & getAvProfileFormatKey();
+	static const std::string & getAvProfileCodecKey();
+	static const std::string & getAvProfilePixelFormatKey();
+	static const std::string & getAvProfileSampleFormatKey();
+	static const std::string & getAvProfileFrameRateKey();
+	static const std::string & getAvProfileSampleRateKey();
+	static const std::string & getAvProfileChannelKey();
+
 private:
 	ProfilesDesc _profiles;
+
+#ifndef SWIG
+public:
+	static const std::string avProfileIdentificator;
+	static const std::string avProfileIdentificatorHuman;
+	static const std::string avProfileType;
+	static const std::string avProfileTypeFormat;
+	static const std::string avProfileTypeVideo;
+	static const std::string avProfileTypeAudio;
+	static const std::string avProfileFormat;
+	static const std::string avProfileCodec;
+	static const std::string avProfilePixelFormat;
+	static const std::string avProfileSampleFormat;
+	static const std::string avProfileFrameRate;
+	static const std::string avProfileSampleRate;
+	static const std::string avProfileChannel;
+#endif
+
 };
 
+
+
 }
 #endif
\ No newline at end of file
diff --git a/src/AvTranscoder/avTranscoder.i b/src/AvTranscoder/avTranscoder.i
index 0be7699e..cb18bfd2 100644
--- a/src/AvTranscoder/avTranscoder.i
+++ b/src/AvTranscoder/avTranscoder.i
@@ -49,25 +49,6 @@
 
 #include <AvTranscoder/transcoder/StreamTranscoder.hpp>
 #include <AvTranscoder/transcoder/Transcoder.hpp>
-
-/* initialize static const members for binding */
-namespace avtranscoder {
-const std::string Profile::avProfileIdentificator = "avProfile";
-const std::string Profile::avProfileIdentificatorHuman = "avProfileLong";
-
-const std::string Profile::avProfileType = "avProfileType";
-const std::string Profile::avProfileTypeFormat = "avProfileTypeFormat";
-const std::string Profile::avProfileTypeVideo = "avProfileTypeVideo";
-const std::string Profile::avProfileTypeAudio = "avProfileTypeAudio";
-
-const std::string Profile::avProfileFormat = "format";
-const std::string Profile::avProfileCodec = "codec";
-const std::string Profile::avProfilePixelFormat = "pix_fmt";
-const std::string Profile::avProfileSampleFormat = "sample_fmt";
-const std::string Profile::avProfileFrameRate = "r";
-const std::string Profile::avProfileSampleRate = "ar";
-const std::string Profile::avProfileChannel = "ac";
-}
 %}
 
 namespace std {	
diff --git a/src/AvTranscoder/essenceStructures/AudioFrame.hpp b/src/AvTranscoder/essenceStructures/AudioFrame.hpp
index 99f01d76..5c0dfddb 100644
--- a/src/AvTranscoder/essenceStructures/AudioFrame.hpp
+++ b/src/AvTranscoder/essenceStructures/AudioFrame.hpp
@@ -31,8 +31,8 @@ class AvExport AudioFrameDesc
 	
 	void setParameters( const Profile::ProfileDesc& desc )
 	{
-		if( desc.find( Profile::avProfileSampleFormat ) != desc.end() )
-			setSampleFormat( desc.find( Profile::avProfileSampleFormat )->second );
+		if( desc.find( Profile::getAvProfileSampleFormatKey() ) != desc.end() )
+			setSampleFormat( desc.find( Profile::getAvProfileSampleFormatKey() )->second );
 	}
 
 	size_t getSampleRate() const { return _sampleRate; }
diff --git a/src/AvTranscoder/essenceStructures/VideoFrame.hpp b/src/AvTranscoder/essenceStructures/VideoFrame.hpp
index 5817b5bc..e35f66e9 100644
--- a/src/AvTranscoder/essenceStructures/VideoFrame.hpp
+++ b/src/AvTranscoder/essenceStructures/VideoFrame.hpp
@@ -51,8 +51,8 @@ class AvExport VideoFrameDesc
 	
 	void setParameters( const Profile::ProfileDesc& desc )
 	{
-		if( desc.find( Profile::avProfilePixelFormat ) != desc.end() )
-			setPixel( Pixel( desc.find( Profile::avProfilePixelFormat )->second.c_str() ) );
+		if( desc.find( Profile::getAvProfilePixelFormatKey() ) != desc.end() )
+			setPixel( Pixel( desc.find( Profile::getAvProfilePixelFormatKey() )->second.c_str() ) );
 	}
 
 	size_t               getWidth ()    const { return _width;  }

From 06573169662eee2303dde0270b585575078a6b5d Mon Sep 17 00:00:00 2001
From: Valentin NOEL <valent.noel@gmail.com>
Date: Thu, 9 Oct 2014 18:58:02 +0200
Subject: [PATCH 02/13] Windows: fix nMake app installing (version and
 extension problems)

---
 app/avInfo/CMakeLists.txt           | 19 ++++++++++++++-----
 app/avMeta/CMakeLists.txt           | 19 ++++++++++++++-----
 app/avTranscoder/CMakeLists.txt     | 19 ++++++++++++++-----
 app/genericProcessor/CMakeLists.txt | 19 ++++++++++++++-----
 app/optionChecker/CMakeLists.txt    | 18 +++++++++++++-----
 app/presetChecker/CMakeLists.txt    | 19 ++++++++++++++-----
 6 files changed, 83 insertions(+), 30 deletions(-)

diff --git a/app/avInfo/CMakeLists.txt b/app/avInfo/CMakeLists.txt
index cf437fa1..2cf9680f 100644
--- a/app/avInfo/CMakeLists.txt
+++ b/app/avInfo/CMakeLists.txt
@@ -11,11 +11,20 @@ set_target_properties(avinfo PROPERTIES VERSION ${AVTRANSCODER_VERSION})
 target_link_libraries(avinfo avtranscoder-shared)
 
 # Install app
-install(
-	FILES "${CMAKE_CURRENT_BINARY_DIR}/avinfo" "${CMAKE_CURRENT_BINARY_DIR}/avinfo-${AVTRANSCODER_VERSION}"
-	PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
-	DESTINATION "bin/"
-)
+if(WIN32)
+	install(
+		FILES "${CMAKE_CURRENT_BINARY_DIR}/avinfo.exe"
+		PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
+		DESTINATION "bin/"
+	)
+else()
+	install(
+		FILES "${CMAKE_CURRENT_BINARY_DIR}/avinfo" "${CMAKE_CURRENT_BINARY_DIR}/avinfo-${AVTRANSCODER_VERSION}"
+		PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
+		DESTINATION "bin/"
+	)
+endif()
+
 install(
 	FILES ${CMAKE_CURRENT_SOURCE_DIR}/avinfo.man
 	RENAME "avinfo.1"
diff --git a/app/avMeta/CMakeLists.txt b/app/avMeta/CMakeLists.txt
index ea01da99..2bcb9983 100644
--- a/app/avMeta/CMakeLists.txt
+++ b/app/avMeta/CMakeLists.txt
@@ -11,11 +11,20 @@ set_target_properties(avmeta PROPERTIES VERSION ${AVTRANSCODER_VERSION})
 target_link_libraries(avmeta avtranscoder-shared)
 
 # Install app
-install(
-	FILES "${CMAKE_CURRENT_BINARY_DIR}/avmeta" "${CMAKE_CURRENT_BINARY_DIR}/avmeta-${AVTRANSCODER_VERSION}"
-	PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
-	DESTINATION "bin/"
-)
+if(WIN32)
+	install(
+		FILES "${CMAKE_CURRENT_BINARY_DIR}/avmeta.exe"
+		PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
+		DESTINATION "bin/"
+	)
+else()
+	install(
+		FILES "${CMAKE_CURRENT_BINARY_DIR}/avmeta" "${CMAKE_CURRENT_BINARY_DIR}/avmeta-${AVTRANSCODER_VERSION}"
+		PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
+		DESTINATION "bin/"
+	)
+endif()
+
 install(
 	FILES ${CMAKE_CURRENT_SOURCE_DIR}/avmeta.man
 	RENAME "avmeta.1"
diff --git a/app/avTranscoder/CMakeLists.txt b/app/avTranscoder/CMakeLists.txt
index f312fc2e..cf97466e 100644
--- a/app/avTranscoder/CMakeLists.txt
+++ b/app/avTranscoder/CMakeLists.txt
@@ -11,11 +11,20 @@ set_target_properties(avtranscoder PROPERTIES VERSION ${AVTRANSCODER_VERSION})
 target_link_libraries(avtranscoder avtranscoder-shared)
 
 # Install app
-install(
-	FILES "${CMAKE_CURRENT_BINARY_DIR}/avtranscoder" "${CMAKE_CURRENT_BINARY_DIR}/avtranscoder-${AVTRANSCODER_VERSION}"
-	PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
-	DESTINATION "bin/"
-)
+if(WIN32)
+	install(
+		FILES "${CMAKE_CURRENT_BINARY_DIR}/avtranscoder.exe"
+		PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
+		DESTINATION "bin/"
+	)
+else()
+	install(
+		FILES "${CMAKE_CURRENT_BINARY_DIR}/avtranscoder" "${CMAKE_CURRENT_BINARY_DIR}/avtranscoder-${AVTRANSCODER_VERSION}"
+		PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
+		DESTINATION "bin/"
+	)
+endif()
+
 install(
 	FILES ${CMAKE_CURRENT_SOURCE_DIR}/av++.man
 	RENAME av++.1
diff --git a/app/genericProcessor/CMakeLists.txt b/app/genericProcessor/CMakeLists.txt
index 6a1fe4fe..69a4e0ba 100644
--- a/app/genericProcessor/CMakeLists.txt
+++ b/app/genericProcessor/CMakeLists.txt
@@ -11,11 +11,20 @@ set_target_properties(avprocessor PROPERTIES VERSION ${AVTRANSCODER_VERSION})
 target_link_libraries(avprocessor avtranscoder-shared)
 
 # Install app
-install(
-	FILES "${CMAKE_CURRENT_BINARY_DIR}/avprocessor" "${CMAKE_CURRENT_BINARY_DIR}/avprocessor-${AVTRANSCODER_VERSION}"
-	PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
-	DESTINATION "bin/"
-)
+if(WIN32)
+	install(
+		FILES "${CMAKE_CURRENT_BINARY_DIR}/avprocessor.exe"
+		PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
+		DESTINATION "bin/"
+	)
+else()
+	install(
+		FILES "${CMAKE_CURRENT_BINARY_DIR}/avprocessor" "${CMAKE_CURRENT_BINARY_DIR}/avprocessor-${AVTRANSCODER_VERSION}"
+		PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
+		DESTINATION "bin/"
+	)
+endif()
+
 install(
 	FILES ${CMAKE_CURRENT_SOURCE_DIR}/avprocessor.man
 	RENAME avprocessor.1
diff --git a/app/optionChecker/CMakeLists.txt b/app/optionChecker/CMakeLists.txt
index 0372fb90..fa446a36 100644
--- a/app/optionChecker/CMakeLists.txt
+++ b/app/optionChecker/CMakeLists.txt
@@ -13,8 +13,16 @@ set_target_properties(avoptionchecker PROPERTIES VERSION ${AVTRANSCODER_VERSION}
 target_link_libraries(avoptionchecker avtranscoder-shared)
 
 # Install app
-install(
-	FILES "${CMAKE_CURRENT_BINARY_DIR}/avoptionchecker" "${CMAKE_CURRENT_BINARY_DIR}/avoptionchecker-${AVTRANSCODER_VERSION}"
-	PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
-	DESTINATION "bin/"
-)
+if(WIN32)
+	install(
+		FILES "${CMAKE_CURRENT_BINARY_DIR}/avoptionchecker.exe"
+		PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
+		DESTINATION "bin/"
+	)
+else()
+	install(
+		FILES "${CMAKE_CURRENT_BINARY_DIR}/avoptionchecker" "${CMAKE_CURRENT_BINARY_DIR}/avoptionchecker-${AVTRANSCODER_VERSION}"
+		PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
+		DESTINATION "bin/"
+	)
+endif()
diff --git a/app/presetChecker/CMakeLists.txt b/app/presetChecker/CMakeLists.txt
index 763c6031..50246fcf 100644
--- a/app/presetChecker/CMakeLists.txt
+++ b/app/presetChecker/CMakeLists.txt
@@ -13,11 +13,20 @@ set_target_properties(avpresetchecker PROPERTIES VERSION ${AVTRANSCODER_VERSION}
 target_link_libraries(avpresetchecker avtranscoder-shared)
 
 # Install app
-install(
-	FILES "${CMAKE_CURRENT_BINARY_DIR}/avpresetchecker" "${CMAKE_CURRENT_BINARY_DIR}/avpresetchecker-${AVTRANSCODER_VERSION}"
-	PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
-	DESTINATION "bin/"
-)
+if(WIN32)
+	install(
+		FILES "${CMAKE_CURRENT_BINARY_DIR}/avpresetchecker.exe"
+		PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
+		DESTINATION "bin/"
+	)
+else()
+	install(
+		FILES "${CMAKE_CURRENT_BINARY_DIR}/avpresetchecker" "${CMAKE_CURRENT_BINARY_DIR}/avpresetchecker-${AVTRANSCODER_VERSION}"
+		PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
+		DESTINATION "bin/"
+	)
+endif()
+
 install(
 	FILES ${CMAKE_CURRENT_SOURCE_DIR}/avprofiles.man
 	RENAME avprofiles.1

From babccda35a93dfd667ff56052a377e842d21bc9e Mon Sep 17 00:00:00 2001
From: Valentin NOEL <valent.noel@gmail.com>
Date: Mon, 13 Oct 2014 18:56:15 +0200
Subject: [PATCH 03/13] Windows: export missing classes and methods

---
 app/presetChecker/presetChecker.cpp      |  4 ++--
 src/AvTranscoder/Library.hpp             | 12 ++++++------
 src/AvTranscoder/option/Option.hpp       |  4 +++-
 src/AvTranscoder/option/OptionLoader.hpp |  2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/presetChecker/presetChecker.cpp b/app/presetChecker/presetChecker.cpp
index dc231041..6bc2b833 100644
--- a/app/presetChecker/presetChecker.cpp
+++ b/app/presetChecker/presetChecker.cpp
@@ -25,13 +25,13 @@ int main( int argc, char** argv )
 			std::cout << std::setw(35) << key.first << key.second << std::endl;
 
 		try{
-			if( profile.find( avtranscoder::Profile::avProfileType )->second == avtranscoder::Profile::avProfileTypeVideo )
+			if( profile.find( avtranscoder::Profile::getAvProfileTypeKey() )->second == avtranscoder::Profile::getAvProfileTypeVideoKey() )
 			{
 				avtranscoder::AvOutputVideo outputVideo;
 				outputVideo.setProfile( profile, outputVideo.getVideoDesc().getVideoFrameDesc() );
 			}
 
-			if( profile.find( avtranscoder::Profile::avProfileType )->second == avtranscoder::Profile::avProfileTypeAudio )
+			if( profile.find( avtranscoder::Profile::getAvProfileTypeKey() )->second == avtranscoder::Profile::getAvProfileTypeAudioKey() )
 			{
 				avtranscoder::AvOutputAudio outputAudio;
 				outputAudio.setProfile( profile, outputAudio.getAudioDesc().getFrameDesc() );
diff --git a/src/AvTranscoder/Library.hpp b/src/AvTranscoder/Library.hpp
index cd943d98..82219878 100644
--- a/src/AvTranscoder/Library.hpp
+++ b/src/AvTranscoder/Library.hpp
@@ -1,15 +1,15 @@
 #ifndef _AV_TRANSCODER_DESCRIPTION_HPP_
 #define _AV_TRANSCODER_DESCRIPTION_HPP_
 
+#include "common.hpp"
+
 #include <vector>
 #include <string>
 
-#include "common.hpp"
-
 namespace avtranscoder
 {
 
-class Library
+class AvExport Library
 {
 public:
 	Library( const std::string& name, const std::string& license, const size_t major, const size_t minor, const size_t release );
@@ -33,11 +33,11 @@ class Library
 
 typedef std::vector< Library > Libraries;
 
-Libraries getLibraries();
+Libraries AvExport getLibraries();
 
-std::vector<std::string> getInputExtensions();
+std::vector<std::string> AvExport getInputExtensions();
 
-std::vector<std::string> getOutputExtensions();
+std::vector<std::string> AvExport getOutputExtensions();
 
 }
 
diff --git a/src/AvTranscoder/option/Option.hpp b/src/AvTranscoder/option/Option.hpp
index e039cdfd..dac0dcb8 100644
--- a/src/AvTranscoder/option/Option.hpp
+++ b/src/AvTranscoder/option/Option.hpp
@@ -1,6 +1,8 @@
 #ifndef _AV_TRANSCODER_OPTION_HPP
 #define	_AV_TRANSCODER_OPTION_HPP
 
+#include <AvTranscoder/common.hpp>
+
 extern "C" {
 #ifndef __STDC_CONSTANT_MACROS
 	#define __STDC_CONSTANT_MACROS
@@ -33,7 +35,7 @@ enum OptionType
  * Get its type to know what the option is about: Int, Double, Ratio, Choice...
  * Parse its array of options to get the potential childs (Choice and Group).
  */
-class Option
+class AvExport Option
 {
 public:
 	static OptionType getTypeFromAVOption( const char* unit, AVOptionType avType );
diff --git a/src/AvTranscoder/option/OptionLoader.hpp b/src/AvTranscoder/option/OptionLoader.hpp
index 6e5e244b..05833f0a 100644
--- a/src/AvTranscoder/option/OptionLoader.hpp
+++ b/src/AvTranscoder/option/OptionLoader.hpp
@@ -22,7 +22,7 @@ namespace avtranscoder
  * @brief Manage Options.
  * Get a list of options by calling a load****Options(), depending on which FFMpeg / LibAV object you want to analyse.
  */
-class OptionLoader 
+class AvExport OptionLoader 
 {
 public:
 	typedef std::vector<Option> OptionArray;

From 840a0cdf38e436f55d00e55bf588b34d3d556959 Mon Sep 17 00:00:00 2001
From: Valentin NOEL <valent.noel@gmail.com>
Date: Mon, 13 Oct 2014 18:59:23 +0200
Subject: [PATCH 04/13] Windows: set version to the library name

---
 src/CMakeLists.txt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 518d273d..86bdce13 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -25,7 +25,11 @@ target_link_libraries(avtranscoder-static ${FFMPEG_LIBRARIES})
 # Create 'avtranscoder' shared lib
 add_library(avtranscoder-shared SHARED ${AVTRANSCODER_SRC_FILES})
 set_target_properties(avtranscoder-shared PROPERTIES LINKER_LANGUAGE CXX)
-set_target_properties(avtranscoder-shared PROPERTIES OUTPUT_NAME avtranscoder)
+if(WIN32)
+	set_target_properties(avtranscoder-shared PROPERTIES OUTPUT_NAME "avtranscoder-${AVTRANSCODER_VERSION}")
+else()
+	set_target_properties(avtranscoder-shared PROPERTIES OUTPUT_NAME avtranscoder)
+endif()
 set_target_properties(avtranscoder-shared PROPERTIES SOVERSION ${AVTRANSCODER_VERSION_MAJOR})
 set_target_properties(avtranscoder-shared PROPERTIES VERSION ${AVTRANSCODER_VERSION})
 target_link_libraries(avtranscoder-shared ${FFMPEG_LIBRARIES})

From 29f162b017b66ea0bd10f253cf242e01d7967a08 Mon Sep 17 00:00:00 2001
From: Valentin NOEL <valent.noel@gmail.com>
Date: Mon, 13 Oct 2014 19:16:38 +0200
Subject: [PATCH 05/13] Windows: clean app CMakeLists files

---
 app/avInfo/CMakeLists.txt           | 18 ++++++++----------
 app/avMeta/CMakeLists.txt           | 18 ++++++++----------
 app/avTranscoder/CMakeLists.txt     | 18 ++++++++----------
 app/avplay/CMakeLists.txt           |  9 ++++++++-
 app/genericProcessor/CMakeLists.txt | 18 ++++++++----------
 app/optionChecker/CMakeLists.txt    | 18 ++++++++----------
 app/presetChecker/CMakeLists.txt    | 18 +++++-------------
 7 files changed, 53 insertions(+), 64 deletions(-)

diff --git a/app/avInfo/CMakeLists.txt b/app/avInfo/CMakeLists.txt
index 2cf9680f..a79cf781 100644
--- a/app/avInfo/CMakeLists.txt
+++ b/app/avInfo/CMakeLists.txt
@@ -12,19 +12,17 @@ target_link_libraries(avinfo avtranscoder-shared)
 
 # Install app
 if(WIN32)
-	install(
-		FILES "${CMAKE_CURRENT_BINARY_DIR}/avinfo.exe"
-		PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
-		DESTINATION "bin/"
-	)
+	set(BINARY_FILES "${CMAKE_CURRENT_BINARY_DIR}/avinfo.exe")
 else()
-	install(
-		FILES "${CMAKE_CURRENT_BINARY_DIR}/avinfo" "${CMAKE_CURRENT_BINARY_DIR}/avinfo-${AVTRANSCODER_VERSION}"
-		PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
-		DESTINATION "bin/"
-	)
+	set(BINARY_FILES "${CMAKE_CURRENT_BINARY_DIR}/avinfo" "${CMAKE_CURRENT_BINARY_DIR}/avinfo-${AVTRANSCODER_VERSION}")
 endif()
 
+install(
+	FILES ${BINARY_FILES}
+	PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
+	DESTINATION "bin/"
+)
+
 install(
 	FILES ${CMAKE_CURRENT_SOURCE_DIR}/avinfo.man
 	RENAME "avinfo.1"
diff --git a/app/avMeta/CMakeLists.txt b/app/avMeta/CMakeLists.txt
index 2bcb9983..3f888824 100644
--- a/app/avMeta/CMakeLists.txt
+++ b/app/avMeta/CMakeLists.txt
@@ -12,19 +12,17 @@ target_link_libraries(avmeta avtranscoder-shared)
 
 # Install app
 if(WIN32)
-	install(
-		FILES "${CMAKE_CURRENT_BINARY_DIR}/avmeta.exe"
-		PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
-		DESTINATION "bin/"
-	)
+	set(BINARY_FILES "${CMAKE_CURRENT_BINARY_DIR}/avmeta.exe")
 else()
-	install(
-		FILES "${CMAKE_CURRENT_BINARY_DIR}/avmeta" "${CMAKE_CURRENT_BINARY_DIR}/avmeta-${AVTRANSCODER_VERSION}"
-		PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
-		DESTINATION "bin/"
-	)
+	set(BINARY_FILES "${CMAKE_CURRENT_BINARY_DIR}/avmeta" "${CMAKE_CURRENT_BINARY_DIR}/avmeta-${AVTRANSCODER_VERSION}")
 endif()
 
+install(
+	FILES ${BINARY_FILES}
+	PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
+	DESTINATION "bin/"
+)
+
 install(
 	FILES ${CMAKE_CURRENT_SOURCE_DIR}/avmeta.man
 	RENAME "avmeta.1"
diff --git a/app/avTranscoder/CMakeLists.txt b/app/avTranscoder/CMakeLists.txt
index cf97466e..b6b1fc0a 100644
--- a/app/avTranscoder/CMakeLists.txt
+++ b/app/avTranscoder/CMakeLists.txt
@@ -12,19 +12,17 @@ target_link_libraries(avtranscoder avtranscoder-shared)
 
 # Install app
 if(WIN32)
-	install(
-		FILES "${CMAKE_CURRENT_BINARY_DIR}/avtranscoder.exe"
-		PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
-		DESTINATION "bin/"
-	)
+	set(BINARY_FILES "${CMAKE_CURRENT_BINARY_DIR}/avtranscoder.exe")
 else()
-	install(
-		FILES "${CMAKE_CURRENT_BINARY_DIR}/avtranscoder" "${CMAKE_CURRENT_BINARY_DIR}/avtranscoder-${AVTRANSCODER_VERSION}"
-		PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
-		DESTINATION "bin/"
-	)
+	set(BINARY_FILES "${CMAKE_CURRENT_BINARY_DIR}/avtranscoder" "${CMAKE_CURRENT_BINARY_DIR}/avtranscoder-${AVTRANSCODER_VERSION}")
 endif()
 
+install(
+	FILES ${BINARY_FILES}
+	PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
+	DESTINATION "bin/"
+)
+
 install(
 	FILES ${CMAKE_CURRENT_SOURCE_DIR}/av++.man
 	RENAME av++.1
diff --git a/app/avplay/CMakeLists.txt b/app/avplay/CMakeLists.txt
index 2af5cf36..f38bbe0c 100644
--- a/app/avplay/CMakeLists.txt
+++ b/app/avplay/CMakeLists.txt
@@ -28,11 +28,18 @@ set_target_properties(avplay PROPERTIES VERSION ${AVTRANSCODER_VERSION})
 target_link_libraries(avplay avtranscoder-shared ${OPENGL_LIBRARIES} ${GLUT_LIBRARY})
 
 # Install app
+if(WIN32)
+	set(BINARY_FILES "${CMAKE_CURRENT_BINARY_DIR}/avplay.exe")
+else()
+	set(BINARY_FILES "${CMAKE_CURRENT_BINARY_DIR}/avplay" "${CMAKE_CURRENT_BINARY_DIR}/avplay-${AVTRANSCODER_VERSION}")
+endif()
+
 install(
-	FILES "${CMAKE_CURRENT_BINARY_DIR}/avplay" "${CMAKE_CURRENT_BINARY_DIR}/avplay-${AVTRANSCODER_VERSION}"
+	FILES ${BINARY_FILES}
 	PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
 	DESTINATION "bin/"
 )
+
 install(
 	FILES ${CMAKE_CURRENT_SOURCE_DIR}/avplayer.man
 	RENAME avplayer.1
diff --git a/app/genericProcessor/CMakeLists.txt b/app/genericProcessor/CMakeLists.txt
index 69a4e0ba..a673e03c 100644
--- a/app/genericProcessor/CMakeLists.txt
+++ b/app/genericProcessor/CMakeLists.txt
@@ -12,19 +12,17 @@ target_link_libraries(avprocessor avtranscoder-shared)
 
 # Install app
 if(WIN32)
-	install(
-		FILES "${CMAKE_CURRENT_BINARY_DIR}/avprocessor.exe"
-		PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
-		DESTINATION "bin/"
-	)
+	set(BINARY_FILES "${CMAKE_CURRENT_BINARY_DIR}/avprocessor.exe")
 else()
-	install(
-		FILES "${CMAKE_CURRENT_BINARY_DIR}/avprocessor" "${CMAKE_CURRENT_BINARY_DIR}/avprocessor-${AVTRANSCODER_VERSION}"
-		PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
-		DESTINATION "bin/"
-	)
+	set(BINARY_FILES "${CMAKE_CURRENT_BINARY_DIR}/avprocessor" "${CMAKE_CURRENT_BINARY_DIR}/avprocessor-${AVTRANSCODER_VERSION}")
 endif()
 
+install(
+	FILES ${BINARY_FILES}
+	PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
+	DESTINATION "bin/"
+)
+
 install(
 	FILES ${CMAKE_CURRENT_SOURCE_DIR}/avprocessor.man
 	RENAME avprocessor.1
diff --git a/app/optionChecker/CMakeLists.txt b/app/optionChecker/CMakeLists.txt
index fa446a36..bbe82476 100644
--- a/app/optionChecker/CMakeLists.txt
+++ b/app/optionChecker/CMakeLists.txt
@@ -14,15 +14,13 @@ target_link_libraries(avoptionchecker avtranscoder-shared)
 
 # Install app
 if(WIN32)
-	install(
-		FILES "${CMAKE_CURRENT_BINARY_DIR}/avoptionchecker.exe"
-		PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
-		DESTINATION "bin/"
-	)
+	set(BINARY_FILES "${CMAKE_CURRENT_BINARY_DIR}/avoptionchecker.exe")
 else()
-	install(
-		FILES "${CMAKE_CURRENT_BINARY_DIR}/avoptionchecker" "${CMAKE_CURRENT_BINARY_DIR}/avoptionchecker-${AVTRANSCODER_VERSION}"
-		PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
-		DESTINATION "bin/"
-	)
+	set(BINARY_FILES "${CMAKE_CURRENT_BINARY_DIR}/avoptionchecker" "${CMAKE_CURRENT_BINARY_DIR}/avoptionchecker-${AVTRANSCODER_VERSION}")
 endif()
+
+install(
+	FILES ${BINARY_FILES}
+	PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
+	DESTINATION "bin/"
+)
diff --git a/app/presetChecker/CMakeLists.txt b/app/presetChecker/CMakeLists.txt
index 50246fcf..9457bc34 100644
--- a/app/presetChecker/CMakeLists.txt
+++ b/app/presetChecker/CMakeLists.txt
@@ -14,21 +14,13 @@ target_link_libraries(avpresetchecker avtranscoder-shared)
 
 # Install app
 if(WIN32)
-	install(
-		FILES "${CMAKE_CURRENT_BINARY_DIR}/avpresetchecker.exe"
-		PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
-		DESTINATION "bin/"
-	)
+	set(BINARY_FILES "${CMAKE_CURRENT_BINARY_DIR}/avpresetchecker.exe")
 else()
-	install(
-		FILES "${CMAKE_CURRENT_BINARY_DIR}/avpresetchecker" "${CMAKE_CURRENT_BINARY_DIR}/avpresetchecker-${AVTRANSCODER_VERSION}"
-		PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
-		DESTINATION "bin/"
-	)
+	set(BINARY_FILES "${CMAKE_CURRENT_BINARY_DIR}/avpresetchecker" "${CMAKE_CURRENT_BINARY_DIR}/avpresetchecker-${AVTRANSCODER_VERSION}")
 endif()
 
 install(
-	FILES ${CMAKE_CURRENT_SOURCE_DIR}/avprofiles.man
-	RENAME avprofiles.1
-	DESTINATION "share/man/man1/"
+	FILES ${BINARY_FILES}
+	PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
+	DESTINATION "bin/"
 )

From bfeba308fcb81c3c520eabf34d33dc004a476c4d Mon Sep 17 00:00:00 2001
From: Valentin NOEL <valent.noel@gmail.com>
Date: Mon, 13 Oct 2014 19:28:10 +0200
Subject: [PATCH 06/13] Windows: add removed man install into presetChecker app
 CMakeLists file

---
 app/presetChecker/CMakeLists.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/presetChecker/CMakeLists.txt b/app/presetChecker/CMakeLists.txt
index 9457bc34..b9a710a3 100644
--- a/app/presetChecker/CMakeLists.txt
+++ b/app/presetChecker/CMakeLists.txt
@@ -24,3 +24,9 @@ install(
 	PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
 	DESTINATION "bin/"
 )
+
+install(
+	FILES ${CMAKE_CURRENT_SOURCE_DIR}/avprofiles.man
+	RENAME avprofiles.1
+	DESTINATION "share/man/man1/"
+)

From d677cc07e7803c7f9c25833fc0fc3dd1a47b7a85 Mon Sep 17 00:00:00 2001
From: Valentin NOEL <valent.noel@gmail.com>
Date: Mon, 13 Oct 2014 19:41:16 +0200
Subject: [PATCH 07/13] Windows: clean SWIG export into common.hpp

---
 src/AvTranscoder/common.hpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/AvTranscoder/common.hpp b/src/AvTranscoder/common.hpp
index 973d4dc0..8dfeecdb 100644
--- a/src/AvTranscoder/common.hpp
+++ b/src/AvTranscoder/common.hpp
@@ -82,8 +82,10 @@ class AvExport ParamSet
 	void* _objContext;
 };
 
-void AvExport split( std::vector< std::string >& splitedString, const std::string& inputString, const std::string& splitChars = ";" );
-int AvExport getFilesInDir( const std::string& dir, std::vector< std::string >& files );
+#ifndef SWIG
+void split( std::vector< std::string >& splitedString, const std::string& inputString, const std::string& splitChars = ";" );
+int getFilesInDir( const std::string& dir, std::vector< std::string >& files );
+#endif
 
 std::string AvExport getFormat( const std::string& filename );
 bool AvExport matchFormat( const std::string& format, const std::string& filename );

From 4092ed0925bc79f809b038457cbd2f7eda1e65be Mon Sep 17 00:00:00 2001
From: Valentin NOEL <valent.noel@gmail.com>
Date: Mon, 13 Oct 2014 19:42:22 +0200
Subject: [PATCH 08/13] Windows: move SWIG common.hpp inclusion from
 avTranscoder.i to progress.i

---
 src/AvTranscoder/avTranscoder.i      | 4 ----
 src/AvTranscoder/progress/progress.i | 2 ++
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/AvTranscoder/avTranscoder.i b/src/AvTranscoder/avTranscoder.i
index cb18bfd2..8766b1d8 100644
--- a/src/AvTranscoder/avTranscoder.i
+++ b/src/AvTranscoder/avTranscoder.i
@@ -11,8 +11,6 @@
 %include "AvTranscoder/swig/avExport.i"
 
 %{
-#include <AvTranscoder/common.hpp>
-
 #include <AvTranscoder/Profile.hpp>
 
 #include <AvTranscoder/essenceStructures/Pixel.hpp>
@@ -64,8 +62,6 @@ namespace std {
 %template(ProfilesVector)  vector< map< string, string > >;
 }
 
-%include <AvTranscoder/common.hpp>
-
 %include "AvTranscoder/progress/progress.i"
 
 %include <AvTranscoder/Profile.hpp>
diff --git a/src/AvTranscoder/progress/progress.i b/src/AvTranscoder/progress/progress.i
index 8a676125..7bd30a37 100644
--- a/src/AvTranscoder/progress/progress.i
+++ b/src/AvTranscoder/progress/progress.i
@@ -1,4 +1,5 @@
 %{
+ #include <AvTranscoder/common.hpp>
  #include <AvTranscoder/progress/IProgress.hpp>
  #include <AvTranscoder/progress/ConsoleProgress.hpp>
  #include <AvTranscoder/progress/NoDisplayProgress.hpp>
@@ -7,6 +8,7 @@
 /* turn on director wrapping for IProgress */
 %feature("director") IProgress;
 
+%include <AvTranscoder/common.hpp>
 %include <AvTranscoder/progress/IProgress.hpp>
 %include <AvTranscoder/progress/ConsoleProgress.hpp>
 %include <AvTranscoder/progress/NoDisplayProgress.hpp>

From 53c027daf7e8adac56faecc2da565435583622c6 Mon Sep 17 00:00:00 2001
From: Valentin Noel <van@mikrosimage.eu>
Date: Thu, 16 Oct 2014 14:07:49 +0200
Subject: [PATCH 09/13] CMake: fix a GLUT library loading problem when GLUT_Xi
 or GLUT_Xmu libraries are missing in the GLUT package (even on linux systems)

---
 app/avplay/CMakeLists.txt | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/avplay/CMakeLists.txt b/app/avplay/CMakeLists.txt
index f38bbe0c..6236ae47 100644
--- a/app/avplay/CMakeLists.txt
+++ b/app/avplay/CMakeLists.txt
@@ -13,19 +13,24 @@ endif()
 
 # Check GLUT
 find_package(GLUT)
-if(NOT GLUT_FOUND)
+
+if(NOT GLUT_Xi_LIBRARY OR NOT GLUT_Xmu_LIBRARY)
+	set(GLUT_FOUND FALSE)
+endif()
+
+if(NOT GLUT_FOUND) 
 	message("GLUT not found, will not build avplay app.")
 	return()
 endif()
 
 # Build app
 include_directories(${AVTRANSCODER_SRC_PATH} ${FFMPEG_INCLUDE_DIR})
-include_directories( ${OPENGL_INCLUDE_DIRS}  ${GLUT_INCLUDE_DIRS} )
+include_directories( ${OPENGL_INCLUDE_DIRS}  ${GLUT_INCLUDE_DIR} )
 
 file(GLOB AVPLAY_SRC_FILES "*.cpp" "*.hpp")
 add_executable(avplay ${AVPLAY_SRC_FILES})
 set_target_properties(avplay PROPERTIES VERSION ${AVTRANSCODER_VERSION})
-target_link_libraries(avplay avtranscoder-shared ${OPENGL_LIBRARIES} ${GLUT_LIBRARY})
+target_link_libraries(avplay avtranscoder-shared ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES})
 
 # Install app
 if(WIN32)

From a63de78a48e939493cc25401bebefcbe744006f8 Mon Sep 17 00:00:00 2001
From: Valentin NOEL <valent.noel@gmail.com>
Date: Fri, 17 Oct 2014 15:28:36 +0200
Subject: [PATCH 10/13] Windows: move Profile static members to constants
 namespace

---
 src/AvTranscoder/Profile.cpp                  | 50 ++++---------------
 src/AvTranscoder/Profile.hpp                  | 48 +++++++-----------
 .../essenceStream/AvInputVideo.cpp            |  6 +--
 .../essenceStream/AvOutputAudio.cpp           | 28 +++++------
 .../essenceStream/AvOutputVideo.cpp           | 36 ++++++-------
 .../essenceStructures/AudioFrame.hpp          |  4 +-
 .../essenceStructures/VideoFrame.hpp          |  4 +-
 src/AvTranscoder/file/InputFile.cpp           |  6 +--
 src/AvTranscoder/file/OutputFile.cpp          | 24 ++++-----
 src/AvTranscoder/profile/Avi.hpp              |  8 +--
 src/AvTranscoder/profile/DNxHD.hpp            | 36 ++++++-------
 src/AvTranscoder/profile/Mkv.hpp              |  8 +--
 src/AvTranscoder/profile/Wave.hpp             | 48 +++++++++---------
 src/AvTranscoder/profile/XdCamHd422.hpp       | 12 ++---
 .../transcoder/StreamTranscoder.cpp           |  6 +--
 src/AvTranscoder/transcoder/Transcoder.cpp    |  6 +--
 16 files changed, 144 insertions(+), 186 deletions(-)

diff --git a/src/AvTranscoder/Profile.cpp b/src/AvTranscoder/Profile.cpp
index 79d36b3e..d9005b52 100644
--- a/src/AvTranscoder/Profile.cpp
+++ b/src/AvTranscoder/Profile.cpp
@@ -16,20 +16,6 @@
 namespace avtranscoder
 {
 
-const std::string Profile::avProfileIdentificator( "avProfile" );
-const std::string Profile::avProfileIdentificatorHuman( "avProfileLong" );
-const std::string Profile::avProfileType( "avProfileType" );
-const std::string Profile::avProfileTypeFormat( "avProfileTypeFormat" );
-const std::string Profile::avProfileTypeVideo( "avProfileTypeVideo" );
-const std::string Profile::avProfileTypeAudio( "avProfileTypeAudio" );
-const std::string Profile::avProfileFormat( "format" );
-const std::string Profile::avProfileCodec( "codec" );
-const std::string Profile::avProfilePixelFormat( "pix_fmt" );
-const std::string Profile::avProfileSampleFormat( "sample_fmt" );
-const std::string Profile::avProfileFrameRate( "r" );
-const std::string Profile::avProfileSampleRate( "ar" );
-const std::string Profile::avProfileChannel( "ac" );
-
 Profile::Profile( bool autoload )
 {
 	if( autoload )
@@ -53,11 +39,11 @@ void Profile::loadProfile( const std::string& avProfileFile )
 	}
 	// check if profile contains required values
 	if( 
-		customProfile.count( avProfileIdentificator ) &&
-		customProfile.count( avProfileIdentificatorHuman ) &&
-		customProfile.count( avProfileType ) &&
-		( customProfile.find( avProfileType )->second == avProfileTypeVideo ||
-		customProfile.find( avProfileType )->second == avProfileTypeAudio )
+		customProfile.count( constants::avProfileIdentificator ) &&
+		customProfile.count( constants::avProfileIdentificatorHuman ) &&
+		customProfile.count( constants::avProfileType ) &&
+		( customProfile.find( constants::avProfileType )->second == constants::avProfileTypeVideo ||
+		customProfile.find( constants::avProfileType )->second == constants::avProfileTypeAudio )
 		)
 	{
 		_profiles.push_back( customProfile );
@@ -99,11 +85,11 @@ void Profile::loadProfiles( const std::string& avProfilesPath )
 
 void Profile::update( const ProfileDesc& profile )
 {
-	std::string profileId( profile.find( avProfileIdentificator )->second );
+	std::string profileId( profile.find( constants::avProfileIdentificator )->second );
 	size_t profileIndex = 0;
 	for( ProfilesDesc::iterator it = _profiles.begin(); it != _profiles.end(); ++it )
 	{
-		if( (*it).find( avProfileIdentificator )->second == profileId )
+		if( (*it).find( constants::avProfileIdentificator )->second == profileId )
 		{
 			_profiles.at( profileIndex ) = profile;
 			return;
@@ -125,7 +111,7 @@ Profile::ProfilesDesc Profile::getFormatProfiles()
 
 	for( ProfilesDesc::iterator it = _profiles.begin(); it != _profiles.end(); ++it )
 	{
-		if( (*it).find( avProfileType )->second == avProfileTypeFormat )
+		if( (*it).find( constants::avProfileType )->second == constants::avProfileTypeFormat )
 			profiles.push_back( *it );
 	}
 
@@ -138,7 +124,7 @@ Profile::ProfilesDesc Profile::getVideoProfiles()
 
 	for( ProfilesDesc::iterator it = _profiles.begin(); it != _profiles.end(); ++it )
 	{
-		if( (*it).find( avProfileType )->second == avProfileTypeVideo )
+		if( (*it).find( constants::avProfileType )->second == constants::avProfileTypeVideo )
 			profiles.push_back( *it );
 	}
 
@@ -151,7 +137,7 @@ Profile::ProfilesDesc Profile::getAudioProfiles()
 
 	for( ProfilesDesc::iterator it = _profiles.begin(); it != _profiles.end(); ++it )
 	{
-		if( (*it).find( avProfileType )->second == avProfileTypeAudio )
+		if( (*it).find( constants::avProfileType )->second == constants::avProfileTypeAudio )
 			profiles.push_back( *it );
 	}
 
@@ -162,7 +148,7 @@ Profile::ProfileDesc& Profile::getProfile( const std::string& searchProfile )
 {
 	for( ProfilesDesc::iterator it = _profiles.begin(); it != _profiles.end(); ++it )
 	{
-		if( (*it).find( avProfileIdentificator )->second == searchProfile )
+		if( (*it).find( constants::avProfileIdentificator )->second == searchProfile )
 		{
 			return (*it);
 		}
@@ -170,18 +156,4 @@ Profile::ProfileDesc& Profile::getProfile( const std::string& searchProfile )
 	throw std::runtime_error( "unable to find profile: " + searchProfile );
 }
 
-const std::string & Profile::getAvProfileIdentificatorKey() { return avProfileIdentificator; };
-const std::string & Profile::getAvProfileIdentificatorHumanKey() { return avProfileIdentificatorHuman; };
-const std::string & Profile::getAvProfileTypeKey() { return avProfileType; };
-const std::string & Profile::getAvProfileTypeFormatKey() { return avProfileTypeFormat; };
-const std::string & Profile::getAvProfileTypeVideoKey() { return avProfileTypeVideo; };
-const std::string & Profile::getAvProfileTypeAudioKey() { return avProfileTypeAudio; };
-const std::string & Profile::getAvProfileFormatKey() { return avProfileFormat; };
-const std::string & Profile::getAvProfileCodecKey() { return avProfileCodec; };
-const std::string & Profile::getAvProfilePixelFormatKey() { return avProfilePixelFormat; };
-const std::string & Profile::getAvProfileSampleFormatKey() { return avProfileSampleFormat; };
-const std::string & Profile::getAvProfileFrameRateKey() { return avProfileFrameRate; };
-const std::string & Profile::getAvProfileSampleRateKey() { return avProfileSampleRate; };
-const std::string & Profile::getAvProfileChannelKey() { return avProfileChannel; };
-
 }
diff --git a/src/AvTranscoder/Profile.hpp b/src/AvTranscoder/Profile.hpp
index fcfa2faa..af72a0c4 100644
--- a/src/AvTranscoder/Profile.hpp
+++ b/src/AvTranscoder/Profile.hpp
@@ -11,6 +11,23 @@
 namespace avtranscoder
 {
 
+namespace constants
+{
+	const std::string avProfileIdentificator = "avProfile";
+	const std::string avProfileIdentificatorHuman = "avProfileLong";
+	const std::string avProfileType = "avProfileType";
+	const std::string avProfileTypeFormat = "avProfileTypeFormat";
+	const std::string avProfileTypeVideo = "avProfileTypeVideo";
+	const std::string avProfileTypeAudio = "avProfileTypeAudio";
+	const std::string avProfileFormat = "format";
+	const std::string avProfileCodec = "codec";
+	const std::string avProfilePixelFormat = "pix_fmt";
+	const std::string avProfileSampleFormat = "sample_fmt";
+	const std::string avProfileFrameRate = "r";
+	const std::string avProfileSampleRate = "ar";
+	const std::string avProfileChannel = "ac";
+}
+
 class AvExport Profile
 {
 public:
@@ -37,40 +54,9 @@ class AvExport Profile
 
 	ProfileDesc& getProfile( const std::string& searchProfile );
 
-	static const std::string & getAvProfileIdentificatorKey();
-	static const std::string & getAvProfileIdentificatorHumanKey();
-	static const std::string & getAvProfileTypeKey();
-	static const std::string & getAvProfileTypeFormatKey();
-	static const std::string & getAvProfileTypeVideoKey();
-	static const std::string & getAvProfileTypeAudioKey();
-	static const std::string & getAvProfileFormatKey();
-	static const std::string & getAvProfileCodecKey();
-	static const std::string & getAvProfilePixelFormatKey();
-	static const std::string & getAvProfileSampleFormatKey();
-	static const std::string & getAvProfileFrameRateKey();
-	static const std::string & getAvProfileSampleRateKey();
-	static const std::string & getAvProfileChannelKey();
-
 private:
 	ProfilesDesc _profiles;
 
-#ifndef SWIG
-public:
-	static const std::string avProfileIdentificator;
-	static const std::string avProfileIdentificatorHuman;
-	static const std::string avProfileType;
-	static const std::string avProfileTypeFormat;
-	static const std::string avProfileTypeVideo;
-	static const std::string avProfileTypeAudio;
-	static const std::string avProfileFormat;
-	static const std::string avProfileCodec;
-	static const std::string avProfilePixelFormat;
-	static const std::string avProfileSampleFormat;
-	static const std::string avProfileFrameRate;
-	static const std::string avProfileSampleRate;
-	static const std::string avProfileChannel;
-#endif
-
 };
 
 
diff --git a/src/AvTranscoder/essenceStream/AvInputVideo.cpp b/src/AvTranscoder/essenceStream/AvInputVideo.cpp
index 8a8b8130..e9a551fe 100644
--- a/src/AvTranscoder/essenceStream/AvInputVideo.cpp
+++ b/src/AvTranscoder/essenceStream/AvInputVideo.cpp
@@ -153,9 +153,9 @@ void AvInputVideo::setProfile( const Profile::ProfileDesc& desc )
 
 	for( Profile::ProfileDesc::const_iterator it = desc.begin(); it != desc.end(); ++it )
 	{
-		if( (*it).first == Profile::avProfileIdentificator ||
-			(*it).first == Profile::avProfileIdentificatorHuman ||
-			(*it).first == Profile::avProfileType )
+		if( (*it).first == constants::avProfileIdentificator ||
+			(*it).first == constants::avProfileIdentificatorHuman ||
+			(*it).first == constants::avProfileType )
 			continue;
 
 		try
diff --git a/src/AvTranscoder/essenceStream/AvOutputAudio.cpp b/src/AvTranscoder/essenceStream/AvOutputAudio.cpp
index 24cd76a3..805d8935 100644
--- a/src/AvTranscoder/essenceStream/AvOutputAudio.cpp
+++ b/src/AvTranscoder/essenceStream/AvOutputAudio.cpp
@@ -174,13 +174,13 @@ bool AvOutputAudio::encodeFrame( DataStream& codedFrame )
 
 void AvOutputAudio::setProfile( const Profile::ProfileDesc& desc, const AudioFrameDesc& frameDesc  )
 {
-	if( ! desc.count( Profile::avProfileCodec ) || 		
-		! desc.count( Profile::avProfileSampleFormat ) )
+	if( ! desc.count( constants::avProfileCodec ) || 		
+		! desc.count( constants::avProfileSampleFormat ) )
 	{
-		throw std::runtime_error( "The profile " + desc.find( Profile::avProfileIdentificatorHuman )->second + " is invalid." );
+		throw std::runtime_error( "The profile " + desc.find( constants::avProfileIdentificatorHuman )->second + " is invalid." );
 	}
 	
-	_codedDesc.setCodec( desc.find( Profile::avProfileCodec )->second );
+	_codedDesc.setCodec( desc.find( constants::avProfileCodec )->second );
 	
 	static_cast<AudioDesc>( _codedDesc ).setAudioParameters( frameDesc );
 
@@ -188,11 +188,11 @@ void AvOutputAudio::setProfile( const Profile::ProfileDesc& desc, const AudioFra
 	
 	for( Profile::ProfileDesc::const_iterator it = desc.begin(); it != desc.end(); ++it )
 	{
-		if( (*it).first == Profile::avProfileIdentificator ||
-			(*it).first == Profile::avProfileIdentificatorHuman ||
-			(*it).first == Profile::avProfileType ||
-			(*it).first == Profile::avProfileCodec ||
-			(*it).first == Profile::avProfileSampleFormat )
+		if( (*it).first == constants::avProfileIdentificator ||
+			(*it).first == constants::avProfileIdentificatorHuman ||
+			(*it).first == constants::avProfileType ||
+			(*it).first == constants::avProfileCodec ||
+			(*it).first == constants::avProfileSampleFormat )
 			continue;
 
 		try
@@ -209,11 +209,11 @@ void AvOutputAudio::setProfile( const Profile::ProfileDesc& desc, const AudioFra
 
 	for( Profile::ProfileDesc::const_iterator it = desc.begin(); it != desc.end(); ++it )
 	{
-		if( (*it).first == Profile::avProfileIdentificator ||
-			(*it).first == Profile::avProfileIdentificatorHuman ||
-			(*it).first == Profile::avProfileType ||
-			(*it).first == Profile::avProfileCodec ||
-			(*it).first == Profile::avProfileSampleFormat )
+		if( (*it).first == constants::avProfileIdentificator ||
+			(*it).first == constants::avProfileIdentificatorHuman ||
+			(*it).first == constants::avProfileType ||
+			(*it).first == constants::avProfileCodec ||
+			(*it).first == constants::avProfileSampleFormat )
 			continue;
 
 		try
diff --git a/src/AvTranscoder/essenceStream/AvOutputVideo.cpp b/src/AvTranscoder/essenceStream/AvOutputVideo.cpp
index 2c995797..2539ad24 100644
--- a/src/AvTranscoder/essenceStream/AvOutputVideo.cpp
+++ b/src/AvTranscoder/essenceStream/AvOutputVideo.cpp
@@ -175,16 +175,16 @@ bool AvOutputVideo::encodeFrame( DataStream& codedFrame )
 
 void AvOutputVideo::setProfile( const Profile::ProfileDesc& desc, const avtranscoder::VideoFrameDesc& frameDesc )
 {
-	if( ! desc.count( Profile::avProfileCodec ) ||
-		! desc.count( Profile::avProfilePixelFormat ) || 
-		! desc.count( Profile::avProfileFrameRate ) )
+	if( ! desc.count( constants::avProfileCodec ) ||
+		! desc.count( constants::avProfilePixelFormat ) || 
+		! desc.count( constants::avProfileFrameRate ) )
 	{
-		throw std::runtime_error( "The profile " + desc.find( Profile::avProfileIdentificatorHuman )->second + " is invalid." );
+		throw std::runtime_error( "The profile " + desc.find( constants::avProfileIdentificatorHuman )->second + " is invalid." );
 	}
 	
-	_codedDesc.setCodec( desc.find( Profile::avProfileCodec )->second );
+	_codedDesc.setCodec( desc.find( constants::avProfileCodec )->second );
 	
-	const size_t frameRate = std::strtoul( desc.find( Profile::avProfileFrameRate )->second.c_str(), NULL, 0 );
+	const size_t frameRate = std::strtoul( desc.find( constants::avProfileFrameRate )->second.c_str(), NULL, 0 );
 	static_cast<VideoDesc>( _codedDesc ).setTimeBase( 1, frameRate );
 	
 	static_cast<VideoDesc>( _codedDesc ).setImageParameters( frameDesc );
@@ -193,12 +193,12 @@ void AvOutputVideo::setProfile( const Profile::ProfileDesc& desc, const avtransc
 	
 	for( Profile::ProfileDesc::const_iterator it = desc.begin(); it != desc.end(); ++it )
 	{
-		if( (*it).first == Profile::avProfileIdentificator ||
-			(*it).first == Profile::avProfileIdentificatorHuman ||
-			(*it).first == Profile::avProfileType ||
-			(*it).first == Profile::avProfileCodec ||
-			(*it).first == Profile::avProfilePixelFormat ||
-			(*it).first == Profile::avProfileFrameRate )
+		if( (*it).first == constants::avProfileIdentificator ||
+			(*it).first == constants::avProfileIdentificatorHuman ||
+			(*it).first == constants::avProfileType ||
+			(*it).first == constants::avProfileCodec ||
+			(*it).first == constants::avProfilePixelFormat ||
+			(*it).first == constants::avProfileFrameRate )
 			continue;
 
 		try
@@ -215,12 +215,12 @@ void AvOutputVideo::setProfile( const Profile::ProfileDesc& desc, const avtransc
 
 	for( Profile::ProfileDesc::const_iterator it = desc.begin(); it != desc.end(); ++it )
 	{
-		if( (*it).first == Profile::avProfileIdentificator ||
-			(*it).first == Profile::avProfileIdentificatorHuman ||
-			(*it).first == Profile::avProfileType ||
-			(*it).first == Profile::avProfileCodec ||
-			(*it).first == Profile::avProfilePixelFormat ||
-			(*it).first == Profile::avProfileFrameRate )
+		if( (*it).first == constants::avProfileIdentificator ||
+			(*it).first == constants::avProfileIdentificatorHuman ||
+			(*it).first == constants::avProfileType ||
+			(*it).first == constants::avProfileCodec ||
+			(*it).first == constants::avProfilePixelFormat ||
+			(*it).first == constants::avProfileFrameRate )
 			continue;
 
 		try
diff --git a/src/AvTranscoder/essenceStructures/AudioFrame.hpp b/src/AvTranscoder/essenceStructures/AudioFrame.hpp
index 5c0dfddb..0bc5a2e1 100644
--- a/src/AvTranscoder/essenceStructures/AudioFrame.hpp
+++ b/src/AvTranscoder/essenceStructures/AudioFrame.hpp
@@ -31,8 +31,8 @@ class AvExport AudioFrameDesc
 	
 	void setParameters( const Profile::ProfileDesc& desc )
 	{
-		if( desc.find( Profile::getAvProfileSampleFormatKey() ) != desc.end() )
-			setSampleFormat( desc.find( Profile::getAvProfileSampleFormatKey() )->second );
+		if( desc.find( constants::avProfileSampleFormat ) != desc.end() )
+			setSampleFormat( desc.find( constants::avProfileSampleFormat )->second );
 	}
 
 	size_t getSampleRate() const { return _sampleRate; }
diff --git a/src/AvTranscoder/essenceStructures/VideoFrame.hpp b/src/AvTranscoder/essenceStructures/VideoFrame.hpp
index e35f66e9..211ea457 100644
--- a/src/AvTranscoder/essenceStructures/VideoFrame.hpp
+++ b/src/AvTranscoder/essenceStructures/VideoFrame.hpp
@@ -51,8 +51,8 @@ class AvExport VideoFrameDesc
 	
 	void setParameters( const Profile::ProfileDesc& desc )
 	{
-		if( desc.find( Profile::getAvProfilePixelFormatKey() ) != desc.end() )
-			setPixel( Pixel( desc.find( Profile::getAvProfilePixelFormatKey() )->second.c_str() ) );
+		if( desc.find( constants::avProfilePixelFormat ) != desc.end() )
+			setPixel( Pixel( desc.find( constants::avProfilePixelFormat )->second.c_str() ) );
 	}
 
 	size_t               getWidth ()    const { return _width;  }
diff --git a/src/AvTranscoder/file/InputFile.cpp b/src/AvTranscoder/file/InputFile.cpp
index 60c8f313..ce807c4e 100644
--- a/src/AvTranscoder/file/InputFile.cpp
+++ b/src/AvTranscoder/file/InputFile.cpp
@@ -219,9 +219,9 @@ void InputFile::setProfile( const Profile::ProfileDesc& desc )
 	
 	for( Profile::ProfileDesc::const_iterator it = desc.begin(); it != desc.end(); ++it )
 	{
-		if( (*it).first == Profile::avProfileIdentificator ||
-			(*it).first == Profile::avProfileIdentificatorHuman ||
-			(*it).first == Profile::avProfileType )
+		if( (*it).first == constants::avProfileIdentificator ||
+			(*it).first == constants::avProfileIdentificatorHuman ||
+			(*it).first == constants::avProfileType )
 			continue;
 		
 		try
diff --git a/src/AvTranscoder/file/OutputFile.cpp b/src/AvTranscoder/file/OutputFile.cpp
index a4447129..97cad531 100644
--- a/src/AvTranscoder/file/OutputFile.cpp
+++ b/src/AvTranscoder/file/OutputFile.cpp
@@ -225,25 +225,25 @@ void OutputFile::addMetadata( const std::string& key, const std::string& value )
 
 void OutputFile::setProfile( const Profile::ProfileDesc& desc )
 {
-	if( ! desc.count( Profile::avProfileFormat ) )
+	if( ! desc.count( constants::avProfileFormat ) )
 	{
-		throw std::runtime_error( "The profile " + desc.find( Profile::avProfileIdentificatorHuman )->second + " is invalid." );
+		throw std::runtime_error( "The profile " + desc.find( constants::avProfileIdentificatorHuman )->second + " is invalid." );
 	}
 	
-	if( ! matchFormat( desc.find( Profile::avProfileFormat )->second, _filename ) )
+	if( ! matchFormat( desc.find( constants::avProfileFormat )->second, _filename ) )
 	{
 		throw std::runtime_error( "Invalid format according to the file extension." );
 	}
-	_outputFormat = av_guess_format( desc.find( Profile::avProfileFormat )->second.c_str(), _filename.c_str(), NULL);
+	_outputFormat = av_guess_format( desc.find( constants::avProfileFormat )->second.c_str(), _filename.c_str(), NULL);
 	
 	ParamSet paramSet( _formatContext );
 	
 	for( Profile::ProfileDesc::const_iterator it = desc.begin(); it != desc.end(); ++it )
 	{
-		if( (*it).first == Profile::avProfileIdentificator ||
-			(*it).first == Profile::avProfileIdentificatorHuman ||
-			(*it).first == Profile::avProfileType ||
-			(*it).first == Profile::avProfileFormat )
+		if( (*it).first == constants::avProfileIdentificator ||
+			(*it).first == constants::avProfileIdentificatorHuman ||
+			(*it).first == constants::avProfileType ||
+			(*it).first == constants::avProfileFormat )
 			continue;
 		
 		try
@@ -260,10 +260,10 @@ void OutputFile::setProfile( const Profile::ProfileDesc& desc )
 	
 	for( Profile::ProfileDesc::const_iterator it = desc.begin(); it != desc.end(); ++it )
 	{
-		if( (*it).first == Profile::avProfileIdentificator ||
-			(*it).first == Profile::avProfileIdentificatorHuman ||
-			(*it).first == Profile::avProfileType ||
-			(*it).first == Profile::avProfileFormat )
+		if( (*it).first == constants::avProfileIdentificator ||
+			(*it).first == constants::avProfileIdentificatorHuman ||
+			(*it).first == constants::avProfileType ||
+			(*it).first == constants::avProfileFormat )
 			continue;
 
 		try
diff --git a/src/AvTranscoder/profile/Avi.hpp b/src/AvTranscoder/profile/Avi.hpp
index 30496d5d..e67793e3 100644
--- a/src/AvTranscoder/profile/Avi.hpp
+++ b/src/AvTranscoder/profile/Avi.hpp
@@ -7,11 +7,11 @@ namespace avtranscoder
 void loadAvi( Profile::ProfilesDesc& profiles )
 {
 	Profile::ProfileDesc avi;
-	avi[ Profile::avProfileIdentificator ] = "avi";
-	avi[ Profile::avProfileIdentificatorHuman ] = "AVI (Audio Video Interleaved)";
-	avi[ Profile::avProfileType ] = Profile::avProfileTypeFormat;
+	avi[ constants::avProfileIdentificator ] = "avi";
+	avi[ constants::avProfileIdentificatorHuman ] = "AVI (Audio Video Interleaved)";
+	avi[ constants::avProfileType ] = constants::avProfileTypeFormat;
 
-	avi[ Profile::avProfileFormat ] = "avi";
+	avi[ constants::avProfileFormat ] = "avi";
 
 	profiles.push_back( avi );
 }
diff --git a/src/AvTranscoder/profile/DNxHD.hpp b/src/AvTranscoder/profile/DNxHD.hpp
index 1a998a54..7f9d12bb 100644
--- a/src/AvTranscoder/profile/DNxHD.hpp
+++ b/src/AvTranscoder/profile/DNxHD.hpp
@@ -7,34 +7,34 @@ namespace avtranscoder
 void loadDNxHD( Profile::ProfilesDesc& profiles )
 {
 	Profile::ProfileDesc dnxhd120;
-	dnxhd120[ Profile::avProfileIdentificator ] = "dnxhd120";
-	dnxhd120[ Profile::avProfileIdentificatorHuman ] = "DNxHD 120";
-	dnxhd120[ Profile::avProfileType ] = Profile::avProfileTypeVideo;
-	dnxhd120[ Profile::avProfileCodec ] = "dnxhd";
+	dnxhd120[ constants::avProfileIdentificator ] = "dnxhd120";
+	dnxhd120[ constants::avProfileIdentificatorHuman ] = "DNxHD 120";
+	dnxhd120[ constants::avProfileType ] = constants::avProfileTypeVideo;
+	dnxhd120[ constants::avProfileCodec ] = "dnxhd";
 	dnxhd120[ "b" ] = "120000000";
-	dnxhd120[ Profile::avProfilePixelFormat ] = "yuv422p";
+	dnxhd120[ constants::avProfilePixelFormat ] = "yuv422p";
 	dnxhd120[ "g" ] = "1";
-	dnxhd120[ Profile::avProfileFrameRate ] = "25";
+	dnxhd120[ constants::avProfileFrameRate ] = "25";
 
 	Profile::ProfileDesc dnxhd185;
-	dnxhd185[ Profile::avProfileIdentificator ] = "dnxhd185";
-	dnxhd185[ Profile::avProfileIdentificatorHuman ] = "DNxHD 185";
-	dnxhd185[ Profile::avProfileType ] = Profile::avProfileTypeVideo;
-	dnxhd185[ Profile::avProfileCodec ] = "dnxhd";
+	dnxhd185[ constants::avProfileIdentificator ] = "dnxhd185";
+	dnxhd185[ constants::avProfileIdentificatorHuman ] = "DNxHD 185";
+	dnxhd185[ constants::avProfileType ] = constants::avProfileTypeVideo;
+	dnxhd185[ constants::avProfileCodec ] = "dnxhd";
 	dnxhd185[ "b" ] = "185000000";
-	dnxhd185[ Profile::avProfilePixelFormat ] = "yuv422p";
+	dnxhd185[ constants::avProfilePixelFormat ] = "yuv422p";
 	dnxhd185[ "g" ] = "1";
-	dnxhd185[ Profile::avProfileFrameRate ] = "25";
+	dnxhd185[ constants::avProfileFrameRate ] = "25";
 
 	Profile::ProfileDesc dnxhd185x;
-	dnxhd185x[ Profile::avProfileIdentificator ] = "dnxhd185x";
-	dnxhd185x[ Profile::avProfileIdentificatorHuman ] = "DNxHD 185 X";
-	dnxhd185x[ Profile::avProfileType ] = Profile::avProfileTypeVideo;
-	dnxhd185x[ Profile::avProfileCodec ] = "dnxhd";
+	dnxhd185x[ constants::avProfileIdentificator ] = "dnxhd185x";
+	dnxhd185x[ constants::avProfileIdentificatorHuman ] = "DNxHD 185 X";
+	dnxhd185x[ constants::avProfileType ] = constants::avProfileTypeVideo;
+	dnxhd185x[ constants::avProfileCodec ] = "dnxhd";
 	dnxhd185x[ "b" ] = "185000000";
-	dnxhd185x[ Profile::avProfilePixelFormat ] = "yuv422p10";
+	dnxhd185x[ constants::avProfilePixelFormat ] = "yuv422p10";
 	dnxhd185x[ "g" ] = "1";
-	dnxhd185x[ Profile::avProfileFrameRate ] = "25";
+	dnxhd185x[ constants::avProfileFrameRate ] = "25";
 
 	profiles.push_back( dnxhd120 );
 	profiles.push_back( dnxhd185 );
diff --git a/src/AvTranscoder/profile/Mkv.hpp b/src/AvTranscoder/profile/Mkv.hpp
index abf5a12c..d80f8dff 100644
--- a/src/AvTranscoder/profile/Mkv.hpp
+++ b/src/AvTranscoder/profile/Mkv.hpp
@@ -7,11 +7,11 @@ namespace avtranscoder
 void loadMkv( Profile::ProfilesDesc& profiles )
 {
 	Profile::ProfileDesc mkv;
-	mkv[ Profile::avProfileIdentificator ] = "mkv";
-	mkv[ Profile::avProfileIdentificatorHuman ] = "Matroska";
-	mkv[ Profile::avProfileType ] = Profile::avProfileTypeFormat;
+	mkv[ constants::avProfileIdentificator ] = "mkv";
+	mkv[ constants::avProfileIdentificatorHuman ] = "Matroska";
+	mkv[ constants::avProfileType ] = constants::avProfileTypeFormat;
 
-	mkv[ Profile::avProfileFormat ] = "matroska";
+	mkv[ constants::avProfileFormat ] = "matroska";
 
 	profiles.push_back( mkv );
 }
diff --git a/src/AvTranscoder/profile/Wave.hpp b/src/AvTranscoder/profile/Wave.hpp
index f075737d..62328bb5 100644
--- a/src/AvTranscoder/profile/Wave.hpp
+++ b/src/AvTranscoder/profile/Wave.hpp
@@ -7,52 +7,52 @@ namespace avtranscoder
 void loadWave( Profile::ProfilesDesc& profiles )
 {
 	Profile::ProfileDesc wave48k;
-	wave48k[ Profile::avProfileType ] = Profile::avProfileTypeAudio;
-	wave48k[ Profile::avProfileSampleRate ] = "48000";
+	wave48k[ constants::avProfileType ] = constants::avProfileTypeAudio;
+	wave48k[ constants::avProfileSampleRate ] = "48000";
 
 	// 48kHz - 16bits little endian - mono
-	wave48k[ Profile::avProfileIdentificator ] = "wave16b48kmono";
-	wave48k[ Profile::avProfileIdentificatorHuman ] = "Wave 16bits 48kHz mono";
-	wave48k[ Profile::avProfileCodec ] = "pcm_s16le";
-	wave48k[ Profile::avProfileSampleFormat ] = "s16";
-	wave48k[ Profile::avProfileChannel ] = "1";
+	wave48k[ constants::avProfileIdentificator ] = "wave16b48kmono";
+	wave48k[ constants::avProfileIdentificatorHuman ] = "Wave 16bits 48kHz mono";
+	wave48k[ constants::avProfileCodec ] = "pcm_s16le";
+	wave48k[ constants::avProfileSampleFormat ] = "s16";
+	wave48k[ constants::avProfileChannel ] = "1";
 
 	profiles.push_back( wave48k );
 
 	// 48kHz - 16bits little endian - stereo
-	wave48k[ Profile::avProfileIdentificator ] = "wave16b48kstereo";
-	wave48k[ Profile::avProfileIdentificatorHuman ] = "Wave 16bits 48kHz stereo";
-	wave48k[ Profile::avProfileChannel ] = "2";
+	wave48k[ constants::avProfileIdentificator ] = "wave16b48kstereo";
+	wave48k[ constants::avProfileIdentificatorHuman ] = "Wave 16bits 48kHz stereo";
+	wave48k[ constants::avProfileChannel ] = "2";
 
 	profiles.push_back( wave48k );
 
 	// 48kHz - 16bits little endian - 5.1
-	wave48k[ Profile::avProfileIdentificator ] = "wave16b48k5_1";
-	wave48k[ Profile::avProfileIdentificatorHuman ] = "Wave 16bits 48kHz 5.1";
-	wave48k[ Profile::avProfileChannel ] = "6";
+	wave48k[ constants::avProfileIdentificator ] = "wave16b48k5_1";
+	wave48k[ constants::avProfileIdentificatorHuman ] = "Wave 16bits 48kHz 5.1";
+	wave48k[ constants::avProfileChannel ] = "6";
 
 	profiles.push_back( wave48k );
 
 	// 48kHz - 24bits little endian - mono
-	wave48k[ Profile::avProfileIdentificator ] = "wave24b48kmono";
-	wave48k[ Profile::avProfileIdentificatorHuman ] = "Wave 24bits 48kHz mono";
-	wave48k[ Profile::avProfileCodec ] = "pcm_s24le";
-	wave48k[ Profile::avProfileSampleFormat ] = "s32";
-	wave48k[ Profile::avProfileChannel ] = "1";
+	wave48k[ constants::avProfileIdentificator ] = "wave24b48kmono";
+	wave48k[ constants::avProfileIdentificatorHuman ] = "Wave 24bits 48kHz mono";
+	wave48k[ constants::avProfileCodec ] = "pcm_s24le";
+	wave48k[ constants::avProfileSampleFormat ] = "s32";
+	wave48k[ constants::avProfileChannel ] = "1";
 
 	profiles.push_back( wave48k );
 
 	// 48kHz - 24bits little endian - stereo
-	wave48k[ Profile::avProfileIdentificator ] = "wave24b48kstereo";
-	wave48k[ Profile::avProfileIdentificatorHuman ] = "Wave 24bits 48kHz stereo";
-	wave48k[ Profile::avProfileChannel ] = "2";
+	wave48k[ constants::avProfileIdentificator ] = "wave24b48kstereo";
+	wave48k[ constants::avProfileIdentificatorHuman ] = "Wave 24bits 48kHz stereo";
+	wave48k[ constants::avProfileChannel ] = "2";
 
 	profiles.push_back( wave48k );
 
 	// 48kHz - 24bits little endian - 5.1
-	wave48k[ Profile::avProfileIdentificator ] = "wave24b48k5_1";
-	wave48k[ Profile::avProfileIdentificatorHuman ] = "Wave 24bits 48kHz 5.1";
-	wave48k[ Profile::avProfileChannel ] = "6";
+	wave48k[ constants::avProfileIdentificator ] = "wave24b48k5_1";
+	wave48k[ constants::avProfileIdentificatorHuman ] = "Wave 24bits 48kHz 5.1";
+	wave48k[ constants::avProfileChannel ] = "6";
 
 	profiles.push_back( wave48k );
 }
diff --git a/src/AvTranscoder/profile/XdCamHd422.hpp b/src/AvTranscoder/profile/XdCamHd422.hpp
index b96be302..82ae8084 100644
--- a/src/AvTranscoder/profile/XdCamHd422.hpp
+++ b/src/AvTranscoder/profile/XdCamHd422.hpp
@@ -8,12 +8,12 @@ void loadXdCamHD422( Profile::ProfilesDesc& profiles )
 {
 	Profile::ProfileDesc xdCamHd422;
 
-	xdCamHd422[ Profile::avProfileIdentificator ] = "xdcamhd422";
-	xdCamHd422[ Profile::avProfileIdentificatorHuman ] = "XdCamHD 422";
-	xdCamHd422[ Profile::avProfileType ] = Profile::avProfileTypeVideo;
+	xdCamHd422[ constants::avProfileIdentificator ] = "xdcamhd422";
+	xdCamHd422[ constants::avProfileIdentificatorHuman ] = "XdCamHD 422";
+	xdCamHd422[ constants::avProfileType ] = constants::avProfileTypeVideo;
 
 
-	xdCamHd422[ Profile::avProfileCodec ] = "mpeg2video";
+	xdCamHd422[ constants::avProfileCodec ] = "mpeg2video";
 	xdCamHd422[ "profile" ] = "0"; // FF_PROFILE_MPEG2_422
 	xdCamHd422[ "level" ] = "2";
 
@@ -23,9 +23,9 @@ void loadXdCamHD422( Profile::ProfilesDesc& profiles )
 	xdCamHd422[ "qmin" ] = "2";
 	xdCamHd422[ "qmax" ] = "12";
 	xdCamHd422[ "dc" ] = "2"; // 10 - 8 = 2
-	xdCamHd422[ Profile::avProfileFrameRate ] = "25";
+	xdCamHd422[ constants::avProfileFrameRate ] = "25";
 
-	xdCamHd422[ Profile::avProfilePixelFormat ] = "yuv422p";
+	xdCamHd422[ constants::avProfilePixelFormat ] = "yuv422p";
 
 	// color informations are not used in FFmpeg/LibAV for Mpeg2
 	xdCamHd422[ "colorspace" ] = "1"; // AVCOL_SPC_BT709
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
index 054ff5aa..6ad23857 100644
--- a/src/AvTranscoder/transcoder/StreamTranscoder.cpp
+++ b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -184,10 +184,10 @@ StreamTranscoder::StreamTranscoder(
 	, _infinityStream( false )
 {
 	// create a coding case based on a InputEssence (aka generator)
-	if( ! profile.count( Profile::avProfileType ) )
+	if( ! profile.count( constants::avProfileType ) )
 		throw std::runtime_error( "unable to found stream type (audio, video, etc.)" );
 
-	if( profile.find( Profile::avProfileType )->second == Profile::avProfileTypeVideo )
+	if( profile.find( constants::avProfileType )->second == constants::avProfileTypeVideo )
 	{
 		AvOutputVideo* outputVideo = new AvOutputVideo();
 		
@@ -210,7 +210,7 @@ StreamTranscoder::StreamTranscoder(
 		return;
 	}
 
-	if( profile.find( Profile::avProfileType )->second == Profile::avProfileTypeAudio )
+	if( profile.find( constants::avProfileType )->second == constants::avProfileTypeAudio )
 	{
 		AvOutputAudio* outputAudio = new AvOutputAudio();
 
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
index 76ab5858..2f709e67 100644
--- a/src/AvTranscoder/transcoder/Transcoder.cpp
+++ b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -408,10 +408,10 @@ void Transcoder::addTranscodeStream( const std::string& filename, const size_t s
 
 void Transcoder::addDummyStream( const Profile::ProfileDesc& profile, const CodedDesc& essenceDesc )
 {
-	if( ! profile.count( Profile::avProfileType ) )
+	if( ! profile.count( constants::avProfileType ) )
 		throw std::runtime_error( "unable to found stream type (audio, video, etc.)" );
 
-	if( profile.find( Profile::avProfileType )->second == Profile::avProfileTypeAudio )
+	if( profile.find( constants::avProfileType )->second == constants::avProfileTypeAudio )
 	{
 		if( _verbose )
 			std::cout << "add a generated audio stream" << std::endl;
@@ -421,7 +421,7 @@ void Transcoder::addDummyStream( const Profile::ProfileDesc& profile, const Code
 		_streamTranscoders.push_back( new StreamTranscoder( *_generatorAudio.back(), _outputFile, profile ) );
 	}
 
-	if( profile.find( Profile::avProfileType )->second == Profile::avProfileTypeVideo )
+	if( profile.find( constants::avProfileType )->second == constants::avProfileTypeVideo )
 	{
 		if( _verbose )
 			std::cout << "add generated video stream" << std::endl;

From afd15a9d5a61f2e543921889b328a8b2ed6438d5 Mon Sep 17 00:00:00 2001
From: Valentin NOEL <valent.noel@gmail.com>
Date: Fri, 17 Oct 2014 15:39:59 +0200
Subject: [PATCH 11/13] Windows: set CXX_FLAGS for MSVC runtime libraries
 static link

---
 CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 51e14270..b5911127 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,6 +20,9 @@ set(CMAKE_VERBOSE_MAKEFILE OFF)
 if(NOT WIN32)
 	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -fPIC -pg -g")
 	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fPIC -O3")
+else()
+	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
+	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
 endif()
 
 

From 659537c4b05c63105f0268b1e402664dbfeebe4c Mon Sep 17 00:00:00 2001
From: Valentin NOEL <valent.noel@gmail.com>
Date: Fri, 17 Oct 2014 15:42:15 +0200
Subject: [PATCH 12/13] Windows: skip optionChecker and presetChecker builds if
 C++11 not supported

---
 app/optionChecker/CMakeLists.txt | 8 +++++++-
 app/presetChecker/CMakeLists.txt | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/optionChecker/CMakeLists.txt b/app/optionChecker/CMakeLists.txt
index bbe82476..ca1d20a0 100644
--- a/app/optionChecker/CMakeLists.txt
+++ b/app/optionChecker/CMakeLists.txt
@@ -7,7 +7,13 @@ include(AvTranscoderMacros)
 # Build app
 include_directories(${AVTRANSCODER_SRC_PATH} ${FFMPEG_INCLUDE_DIR})
 # Add C++11 flag
-set(CMAKE_CXX_FLAGS "-std=c++0x")
+if(NOT WIN32)
+	set(CMAKE_CXX_FLAGS "-std=c++0x")
+elseif(NOT MSVC12)
+	message("C++11 not supported, will not build avOptionChecker app.")
+	return()
+endif()
+
 add_executable(avoptionchecker optionChecker.cpp)
 set_target_properties(avoptionchecker PROPERTIES VERSION ${AVTRANSCODER_VERSION})
 target_link_libraries(avoptionchecker avtranscoder-shared)
diff --git a/app/presetChecker/CMakeLists.txt b/app/presetChecker/CMakeLists.txt
index b9a710a3..d179f514 100644
--- a/app/presetChecker/CMakeLists.txt
+++ b/app/presetChecker/CMakeLists.txt
@@ -7,7 +7,13 @@ include(AvTranscoderMacros)
 # Build app
 include_directories(${AVTRANSCODER_SRC_PATH} ${FFMPEG_INCLUDE_DIR})
 # Add C++11 flag
-set(CMAKE_CXX_FLAGS "-std=c++0x")
+if(NOT WIN32)
+	set(CMAKE_CXX_FLAGS "-std=c++0x")
+elseif(NOT MSVC12)
+	message("C++11 not supported, will not build avPresetChecker app.")
+	return()
+endif()
+
 add_executable(avpresetchecker presetChecker.cpp)
 set_target_properties(avpresetchecker PROPERTIES VERSION ${AVTRANSCODER_VERSION})
 target_link_libraries(avpresetchecker avtranscoder-shared)

From 7bf7eea88189747cbc885c8c074f03d539335339 Mon Sep 17 00:00:00 2001
From: Valentin Noel <van@mikrosimage.eu>
Date: Fri, 17 Oct 2014 16:20:20 +0200
Subject: [PATCH 13/13] Windows: replace Profile constants into presetChecker
 app

---
 app/presetChecker/presetChecker.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/presetChecker/presetChecker.cpp b/app/presetChecker/presetChecker.cpp
index 6bc2b833..f3b0ebc1 100644
--- a/app/presetChecker/presetChecker.cpp
+++ b/app/presetChecker/presetChecker.cpp
@@ -25,13 +25,13 @@ int main( int argc, char** argv )
 			std::cout << std::setw(35) << key.first << key.second << std::endl;
 
 		try{
-			if( profile.find( avtranscoder::Profile::getAvProfileTypeKey() )->second == avtranscoder::Profile::getAvProfileTypeVideoKey() )
+			if( profile.find( avtranscoder::constants::avProfileType )->second == avtranscoder::constants::avProfileTypeVideo )
 			{
 				avtranscoder::AvOutputVideo outputVideo;
 				outputVideo.setProfile( profile, outputVideo.getVideoDesc().getVideoFrameDesc() );
 			}
 
-			if( profile.find( avtranscoder::Profile::getAvProfileTypeKey() )->second == avtranscoder::Profile::getAvProfileTypeAudioKey() )
+			if( profile.find( avtranscoder::constants::avProfileType )->second == avtranscoder::constants::avProfileTypeAudio )
 			{
 				avtranscoder::AvOutputAudio outputAudio;
 				outputAudio.setProfile( profile, outputAudio.getAudioDesc().getFrameDesc() );