Merge branch 'master' of https://github.com/avTranscoder/avTranscoder into dev_common_naming_nomenclature

Clement Champetier · Clement Champetier · commit e43215bd562a · 2014-09-24T15:37:03.000+02:00
Conflicts:
	app/avMeta/avMeta.cpp
	app/avTranscoder/avTranscoder.cpp
	app/avplay/AvReader.hpp
	app/genericProcessor/genericProcessor.cpp
	src/AvTranscoder/file/InputFile.hpp
	src/AvTranscoder/progress/progress.i
diff --git a/app/avMeta/avMeta.cpp b/app/avMeta/avMeta.cpp
@@ -1,5 +1,6 @@
 #include <AvTranscoder/file/InputFile.hpp>
 #include <AvTranscoder/mediaProperty/printMediaProperties.hpp>
+
 #include <AvTranscoder/progress/NoDisplayProgress.hpp>
 
 #include <iostream>
diff --git a/app/avTranscoder/avTranscoder.cpp b/app/avTranscoder/avTranscoder.cpp
@@ -4,13 +4,14 @@
 
 #include <AvTranscoder/file/InputFile.hpp>
 #include <AvTranscoder/file/OutputFile.hpp>
-#include <AvTranscoder/progress/ConsoleProgress.hpp>
 #include <AvTranscoder/essenceStream/AvInputAudio.hpp>
 #include <AvTranscoder/essenceStream/AvInputVideo.hpp>
 #include <AvTranscoder/essenceStream/AvOutputAudio.hpp>
 #include <AvTranscoder/essenceStream/AvOutputVideo.hpp>
 #include <AvTranscoder/essenceTransform/VideoEssenceTransform.hpp>
 
+#include <AvTranscoder/progress/ConsoleProgress.hpp>
+
 void transcodeVideo( const char* inputfilename, const char* outputFilename )
 {
 	using namespace avtranscoder;
diff --git a/app/avplay/AvReader.hpp b/app/avplay/AvReader.hpp
@@ -6,6 +6,7 @@
 #include <AvTranscoder/essenceStream/AvInputVideo.hpp>
 #include <AvTranscoder/essenceTransform/VideoEssenceTransform.hpp>
 #include <AvTranscoder/mediaProperty/printMediaProperties.hpp>
+
 #include <AvTranscoder/progress/ConsoleProgress.hpp>
 
 #include "Reader.hpp"
diff --git a/app/genericProcessor/genericProcessor.cpp b/app/genericProcessor/genericProcessor.cpp
@@ -1,4 +1,5 @@
 #include <AvTranscoder/transcoder/Transcoder.hpp>
+
 #include <AvTranscoder/progress/ConsoleProgress.hpp>
 
 #include <iostream>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#include <AvTranscoder/transcoder/Transcoder.hpp>`
	`2`	`+`
`2`	`3`	`#include <AvTranscoder/progress/ConsoleProgress.hpp>`
`3`	`4`
`4`	`5`	`#include <iostream>`