Description: update getInputExtensions

Clement Champetier · Clement Champetier · commit 01cc980ebf03 · 2014-06-11T15:36:50.000+02:00
* Sort array of extensions.
* Suppress duplicates.
diff --git a/src/AvTranscoder/Description.hpp b/src/AvTranscoder/Description.hpp
@@ -11,6 +11,7 @@ extern "C" {
 
 #include <vector>
 #include <cstring>
+#include <algorithm> //sort, unique
 
 namespace avtranscoder
 {
@@ -44,7 +45,7 @@ std::vector<std::string> getInputExtensions()
 				ext = strtok( NULL, "," );
 			}
 			
-			//parse name (name's format defines (in general) extensions )
+			// parse name (name's format defines (in general) extensions )
 			ext = const_cast<char*>( iFormat->name );
 			while( ext != NULL )
 			{
@@ -53,6 +54,12 @@ std::vector<std::string> getInputExtensions()
 			}
 		}
 	}
+	// sort
+	std::sort( extensions.begin(), extensions.end() ); 
+	// suppress duplicates
+	std::vector<std::string>::iterator last = std::unique( extensions.begin(), extensions.end() );
+	extensions.erase( last, extensions.end() );
+	
 	return extensions;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ extern "C" {`
`11`	`11`
`12`	`12`	`#include <vector>`
`13`	`13`	`#include <cstring>`
	`14`	`+#include <algorithm> //sort, unique`
`14`	`15`
`15`	`16`	`namespace avtranscoder`
`16`	`17`	`{`
`@@ -44,7 +45,7 @@ std::vector<std::string> getInputExtensions()`
`44`	`45`	`ext = strtok( NULL, "," );`
`45`	`46`	`}`
`46`	`47`
`47`		`- //parse name (name's format defines (in general) extensions )`
	`48`	`+ // parse name (name's format defines (in general) extensions )`
`48`	`49`	`ext = const_cast<char*>( iFormat->name );`
`49`	`50`	`while( ext != NULL )`
`50`	`51`	`{`
`@@ -53,6 +54,12 @@ std::vector<std::string> getInputExtensions()`
`53`	`54`	`}`
`54`	`55`	`}`
`55`	`56`	`}`
	`57`	`+ // sort`
	`58`	`+ std::sort( extensions.begin(), extensions.end() );`
	`59`	`+ // suppress duplicates`
	`60`	`+ std::vector<std::string>::iterator last = std::unique( extensions.begin(), extensions.end() );`
	`61`	`+ extensions.erase( last, extensions.end() );`
	`62`	`+`
`56`	`63`	`return extensions;`
`57`	`64`	`}`
`58`	`65`