util - getOutputFormatOptions: clean

Clement Champetier · Clement Champetier · commit 7efb61212c40 · 2015-04-16T12:16:11.000+02:00
diff --git a/src/AvTranscoder/util.cpp b/src/AvTranscoder/util.cpp
@@ -201,9 +201,7 @@ NamesArray getAudioCodecsNames()
 
 OptionArrayMap getOutputFormatOptions()
 {
-	av_register_all();
-
-	std::map< std::string, std::vector<Option> > optionsPerFormat;
+	OptionArrayMap optionsPerFormat;
 	
 	AVOutputFormat* outputFormat = av_oformat_next( NULL );
 	
@@ -216,7 +214,7 @@ OptionArrayMap getOutputFormatOptions()
 		{
 			if( outputFormat->priv_class )
 			{
-				std::string outputFormatName( outputFormat->name );
+				const std::string outputFormatName( outputFormat->name );
 				OptionArray options;
 				loadOptions( options, (void*)&outputFormat->priv_class, 0  );
 				optionsPerFormat.insert( std::make_pair( outputFormatName, options ) );

Original file line number	Diff line number	Diff line change
`@@ -201,9 +201,7 @@ NamesArray getAudioCodecsNames()`
`201`	`201`
`202`	`202`	`OptionArrayMap getOutputFormatOptions()`
`203`	`203`	`{`
`204`		`- av_register_all();`
`205`		`-`
`206`		`- std::map< std::string, std::vector<Option> > optionsPerFormat;`
	`204`	`+ OptionArrayMap optionsPerFormat;`
`207`	`205`
`208`	`206`	`AVOutputFormat* outputFormat = av_oformat_next( NULL );`
`209`	`207`
`@@ -216,7 +214,7 @@ OptionArrayMap getOutputFormatOptions()`
`216`	`214`	`{`
`217`	`215`	`if( outputFormat->priv_class )`
`218`	`216`	`{`
`219`		`- std::string outputFormatName( outputFormat->name );`
	`217`	`+ const std::string outputFormatName( outputFormat->name );`
`220`	`218`	`OptionArray options;`
`221`	`219`	`loadOptions( options, (void*)&outputFormat->priv_class, 0 );`
`222`	`220`	`optionsPerFormat.insert( std::make_pair( outputFormatName, options ) );`