Merge branch 'release/v0.5.4' into develop

Clement Champetier · Clement Champetier · commit 49d3554e67f7 · 2015-04-17T10:51:39.000+02:00
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -351,7 +351,8 @@ InputFile* Transcoder::addInputFile( const std::string& filename, const size_t s
 
 	for( std::vector< InputFile* >::iterator it = _inputFiles.begin(); it != _inputFiles.end(); ++it )
 	{
-		if( ( (*it)->getFilename() == filename ) )
+		if( ( (*it)->getFilename() == filename ) &&
+			! (*it)->getStream( streamIndex ).isActivated() )
 		{
 			referenceFile = (*it);
 			LOG_DEBUG( "Get instance of InputFile from '" << filename << "'" )

Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,8 @@ InputFile* Transcoder::addInputFile( const std::string& filename, const size_t s`
`351`	`351`
`352`	`352`	`for( std::vector< InputFile* >::iterator it = _inputFiles.begin(); it != _inputFiles.end(); ++it )`
`353`	`353`	`{`
`354`		`- if( ( (*it)->getFilename() == filename ) )`
	`354`	`+ if( ( (*it)->getFilename() == filename ) &&`
	`355`	`+ ! (*it)->getStream( streamIndex ).isActivated() )`
`355`	`356`	`{`
`356`	`357`	`referenceFile = (*it);`
`357`	`358`	`LOG_DEBUG( "Get instance of InputFile from '" << filename << "'" )`