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

Clement Champetier · Clement Champetier · commit 6ef256deb813 · 2014-08-12T16:12:17.000+02:00
diff --git a/src/AvTranscoder/Transcoder/StreamTranscoder.cpp b/src/AvTranscoder/Transcoder/StreamTranscoder.cpp
@@ -225,7 +225,7 @@ StreamTranscoder::StreamTranscoder(
 
 		_transform = new AudioEssenceTransform();
 		
-		_currentEssence = _dummyEssence;
+		_currentEssence = _inputEssence;
 		return;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,7 @@ StreamTranscoder::StreamTranscoder(`
`225`	`225`
`226`	`226`	`_transform = new AudioEssenceTransform();`
`227`	`227`
`228`		`- _currentEssence = _dummyEssence;`
	`228`	`+ _currentEssence = _inputEssence;`
`229`	`229`	`return;`
`230`	`230`	`}`
`231`	`231`