Merge branch 'dev_refactoringStructures' of https://github.com/cchampet/avTranscoder into dev_DummyAudioSetFrame

Clement Champetier · Clement Champetier · commit d939ae161326 · 2014-07-22T11:48:06.000+02:00
diff --git a/src/AvTranscoder/CodedStream/AvInputStream.cpp b/src/AvTranscoder/CodedStream/AvInputStream.cpp
@@ -1,7 +1,6 @@
 #include "AvInputStream.hpp"
 
-#include <stdexcept>
-#include <cassert>
+#include <AvTranscoder/File/InputFile.hpp>
 
 extern "C" {
 #ifndef __STDC_CONSTANT_MACROS
@@ -12,7 +11,8 @@ extern "C" {
 #include <libavformat/avformat.h>
 }
 
-#include <AvTranscoder/File/InputFile.hpp>
+#include <stdexcept>
+#include <cassert>
 
 namespace avtranscoder
 {
diff --git a/src/AvTranscoder/EssenceTransform/VideoEssenceTransform.cpp b/src/AvTranscoder/EssenceTransform/VideoEssenceTransform.cpp
@@ -1,4 +1,7 @@
 #include "VideoEssenceTransform.hpp"
+
+#include <AvTranscoder/EssenceStructures/Pixel.hpp>
+#include <AvTranscoder/EssenceStructures/VideoFrame.hpp>
 #include <AvTranscoder/common.hpp>
 
 extern "C" {
@@ -14,9 +17,6 @@ extern "C" {
 #endif
 }
 
-#include <AvTranscoder/EssenceStructures/Pixel.hpp>
-#include <AvTranscoder/EssenceStructures/VideoFrame.hpp>
-
 #include <iostream>
 #include <iomanip>
 #include <cassert>

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`#include "AvInputStream.hpp"`
`2`	`2`
`3`		`-#include <stdexcept>`
`4`		`-#include <cassert>`
	`3`	`+#include <AvTranscoder/File/InputFile.hpp>`
`5`	`4`
`6`	`5`	`extern "C" {`
`7`	`6`	`#ifndef __STDC_CONSTANT_MACROS`
`@@ -12,7 +11,8 @@ extern "C" {`
`12`	`11`	`#include <libavformat/avformat.h>`
`13`	`12`	`}`
`14`	`13`
`15`		`-#include <AvTranscoder/File/InputFile.hpp>`
	`14`	`+#include <stdexcept>`
	`15`	`+#include <cassert>`
`16`	`16`
`17`	`17`	`namespace avtranscoder`
`18`	`18`	`{`