Merge pull request #135 from cchampet/hotfix_transcoderCreateInputFileOnlyIfNecessary

valnoel · valnoel · commit b06a78fa570d · 2015-03-19T15:39:41.000+01:00
Transcoder: create InputFile only if not already done
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -345,10 +345,10 @@ 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 ) &&
-			( ! (*it)->getStream( streamIndex ).isActivated() ) )
+		if( ( (*it)->getFilename() == filename ) )
 		{
 			referenceFile = (*it);
+			LOG_DEBUG( "Get instance of InputFile from '" << filename << "'" )
 			break;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -345,10 +345,10 @@ InputFile* Transcoder::addInputFile( const std::string& filename, const size_t s`
`345`	`345`
`346`	`346`	`for( std::vector< InputFile* >::iterator it = _inputFiles.begin(); it != _inputFiles.end(); ++it )`
`347`	`347`	`{`
`348`		`- if( ( (*it)->getFilename() == filename ) &&`
`349`		`- ( ! (*it)->getStream( streamIndex ).isActivated() ) )`
	`348`	`+ if( ( (*it)->getFilename() == filename ) )`
`350`	`349`	`{`
`351`	`350`	`referenceFile = (*it);`
	`351`	`+ LOG_DEBUG( "Get instance of InputFile from '" << filename << "'" )`
`352`	`352`	`break;`
`353`	`353`	`}`
`354`	`354`	`}`