decoders: skipped unnecessary set of "codec" option when setupDecoder

Clement Champetier · Clement Champetier · commit a6c5c7aebd3c · 2016-08-22T17:42:14.000+02:00
diff --git a/src/AvTranscoder/decoder/AudioDecoder.cpp b/src/AvTranscoder/decoder/AudioDecoder.cpp
@@ -56,7 +56,8 @@ void AudioDecoder::setupDecoder(const ProfileLoader::Profile& profile)
     for(ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it)
     {
         if((*it).first == constants::avProfileIdentificator || (*it).first == constants::avProfileIdentificatorHuman ||
-           (*it).first == constants::avProfileType || (*it).first == constants::avProfileThreads)
+           (*it).first == constants::avProfileType || (*it).first == constants::avProfileCodec ||
+           (*it).first == constants::avProfileThreads)
             continue;
 
         try
diff --git a/src/AvTranscoder/decoder/VideoDecoder.cpp b/src/AvTranscoder/decoder/VideoDecoder.cpp
@@ -54,7 +54,8 @@ void VideoDecoder::setupDecoder(const ProfileLoader::Profile& profile)
     for(ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it)
     {
         if((*it).first == constants::avProfileIdentificator || (*it).first == constants::avProfileIdentificatorHuman ||
-           (*it).first == constants::avProfileType || (*it).first == constants::avProfileThreads)
+           (*it).first == constants::avProfileType || (*it).first == constants::avProfileCodec ||
+           (*it).first == constants::avProfileThreads)
             continue;
 
         try

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,8 @@ void AudioDecoder::setupDecoder(const ProfileLoader::Profile& profile)`
`56`	`56`	`for(ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it)`
`57`	`57`	`{`
`58`	`58`	`if((it).first == constants::avProfileIdentificator \|\| (it).first == constants::avProfileIdentificatorHuman \|\|`
`59`		`- (it).first == constants::avProfileType \|\| (it).first == constants::avProfileThreads)`
	`59`	`+ (it).first == constants::avProfileType \|\| (it).first == constants::avProfileCodec \|\|`
	`60`	`+ (*it).first == constants::avProfileThreads)`
`60`	`61`	`continue;`
`61`	`62`
`62`	`63`	`try`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,8 @@ void VideoDecoder::setupDecoder(const ProfileLoader::Profile& profile)`
`54`	`54`	`for(ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it)`
`55`	`55`	`{`
`56`	`56`	`if((it).first == constants::avProfileIdentificator \|\| (it).first == constants::avProfileIdentificatorHuman \|\|`
`57`		`- (it).first == constants::avProfileType \|\| (it).first == constants::avProfileThreads)`
	`57`	`+ (it).first == constants::avProfileType \|\| (it).first == constants::avProfileCodec \|\|`
	`58`	`+ (*it).first == constants::avProfileThreads)`
`58`	`59`	`continue;`
`59`	`60`
`60`	`61`	`try`