Merge pull request #152 from cchampet/fix_TranscoderaddInputFile

valnoel · valnoel · commit c5d847a6a947 · 2015-04-02T15:32:34.000+02:00
Transcoder: fix addInputFile check if stream isActivated
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -345,7 +345,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
`@@ -345,7 +345,8 @@ 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 ) )`
	`348`	`+ if( ( (*it)->getFilename() == filename ) &&`
	`349`	`+ ! (*it)->getStream( streamIndex ).isActivated() )`
`349`	`350`	`{`
`350`	`351`	`referenceFile = (*it);`
`351`	`352`	`LOG_DEBUG( "Get instance of InputFile from '" << filename << "'" )`