util: renamed typedef NamesArray to NamesMap

Clement Champetier · Clement Champetier · commit 92689e15df7f · 2016-03-10T10:50:31.000+01:00
Because this is a map since commit 96aed90
diff --git a/src/AvTranscoder/util.cpp b/src/AvTranscoder/util.cpp
@@ -111,9 +111,9 @@ std::string getSampleFormatName(const AVSampleFormat sampleFormat)
     return formatName ? std::string(formatName) : "";
 }
 
-NamesArray getAvailableFormatsNames()
+NamesMap getAvailableFormatsNames()
 {
-    NamesArray formatsNames;
+    NamesMap formatsNames;
 
     AVOutputFormat* fmt = NULL;
     while((fmt = av_oformat_next(fmt)))
@@ -127,9 +127,9 @@ NamesArray getAvailableFormatsNames()
     return formatsNames;
 }
 
-NamesArray getAvailableVideoCodecsNames()
+NamesMap getAvailableVideoCodecsNames()
 {
-    NamesArray videoCodecsNames;
+    NamesMap videoCodecsNames;
 
     AVCodec* c = NULL;
     while((c = av_codec_next(c)) != NULL)
@@ -146,9 +146,9 @@ NamesArray getAvailableVideoCodecsNames()
     return videoCodecsNames;
 }
 
-NamesArray getAvailableAudioCodecsNames()
+NamesMap getAvailableAudioCodecsNames()
 {
-    NamesArray audioCodecsNames;
+    NamesMap audioCodecsNames;
 
     AVCodec* c = NULL;
     while((c = av_codec_next(c)) != NULL)
diff --git a/src/AvTranscoder/util.hpp b/src/AvTranscoder/util.hpp
@@ -17,7 +17,7 @@ namespace avtranscoder
 {
 
 typedef std::map<std::string, OptionArray> OptionArrayMap;
-typedef std::map<std::string, std::string> NamesArray; //< short/long names of format/video codec/audio codec
+typedef std::map<std::string, std::string> NamesMap; //< short/long names of format/video codec/audio codec
 
 /**
 *  @brief Get pixel format supported by a video codec.
@@ -58,22 +58,22 @@ std::string AvExport getPixelFormatName(const AVPixelFormat pixelFormat);
 std::string AvExport getSampleFormatName(const AVSampleFormat sampleFormat);
 
 /**
- * @brief Get array of short/long names of all format available by FFmpeg / libav.
+ * @brief Get a map of short/long names of all format available by FFmpeg / libav.
  * @note Need to call preloadCodecsAndFormats before using this function.
  */
-NamesArray AvExport getAvailableFormatsNames();
+NamesMap AvExport getAvailableFormatsNames();
 
 /**
- * @brief Get array of short/long names of all video codec available by FFmpeg / libav.
+ * @brief Get a map of short/long names of all video codec available by FFmpeg / libav.
  * @note Need to call preloadCodecsAndFormats before using this function.
  */
-NamesArray AvExport getAvailableVideoCodecsNames();
+NamesMap AvExport getAvailableVideoCodecsNames();
 
 /**
- * @brief Get array of short/long names of all audio codec available by FFmpeg / libav.
+ * @brief Get a map of short/long names of all audio codec available by FFmpeg / libav.
  * @note Need to call preloadCodecsAndFormats before using this function.
  */
-NamesArray AvExport getAvailableAudioCodecsNames();
+NamesMap AvExport getAvailableAudioCodecsNames();
 
 #ifndef SWIG
 /**

Original file line number	Diff line number	Diff line change
`@@ -111,9 +111,9 @@ std::string getSampleFormatName(const AVSampleFormat sampleFormat)`
`111`	`111`	`return formatName ? std::string(formatName) : "";`
`112`	`112`	`}`
`113`	`113`
`114`		`-NamesArray getAvailableFormatsNames()`
	`114`	`+NamesMap getAvailableFormatsNames()`
`115`	`115`	`{`
`116`		`- NamesArray formatsNames;`
	`116`	`+ NamesMap formatsNames;`
`117`	`117`
`118`	`118`	`AVOutputFormat* fmt = NULL;`
`119`	`119`	`while((fmt = av_oformat_next(fmt)))`
`@@ -127,9 +127,9 @@ NamesArray getAvailableFormatsNames()`
`127`	`127`	`return formatsNames;`
`128`	`128`	`}`
`129`	`129`
`130`		`-NamesArray getAvailableVideoCodecsNames()`
	`130`	`+NamesMap getAvailableVideoCodecsNames()`
`131`	`131`	`{`
`132`		`- NamesArray videoCodecsNames;`
	`132`	`+ NamesMap videoCodecsNames;`
`133`	`133`
`134`	`134`	`AVCodec* c = NULL;`
`135`	`135`	`while((c = av_codec_next(c)) != NULL)`
`@@ -146,9 +146,9 @@ NamesArray getAvailableVideoCodecsNames()`
`146`	`146`	`return videoCodecsNames;`
`147`	`147`	`}`
`148`	`148`
`149`		`-NamesArray getAvailableAudioCodecsNames()`
	`149`	`+NamesMap getAvailableAudioCodecsNames()`
`150`	`150`	`{`
`151`		`- NamesArray audioCodecsNames;`
	`151`	`+ NamesMap audioCodecsNames;`
`152`	`152`
`153`	`153`	`AVCodec* c = NULL;`
`154`	`154`	`while((c = av_codec_next(c)) != NULL)`