util: get codecs without long_name when getAvailableVideo/AudioCodecsNames

Clement Champetier · Clement Champetier · commit 645d63d67e60 · 2016-03-09T17:05:59.000+01:00
diff --git a/src/AvTranscoder/util.cpp b/src/AvTranscoder/util.cpp
@@ -146,10 +146,10 @@ NamesArray getAvailableVideoCodecsNames()
     {
         if(c->type == AVMEDIA_TYPE_VIDEO)
         {
-            if(!c->name && !c->long_name)
+            if(!c->name)
                 continue;
 
-            std::pair<std::string, std::string> codecNames(std::string(c->name ? c->name : ""),
+            std::pair<std::string, std::string> codecNames(std::string(c->name),
                                                            std::string(c->long_name ? c->long_name : ""));
 
             // skip duplicates
@@ -171,10 +171,10 @@ NamesArray getAvailableAudioCodecsNames()
     {
         if(c->type == AVMEDIA_TYPE_AUDIO)
         {
-            if(!c->name && !c->long_name)
+            if(!c->name)
                 continue;
 
-            std::pair<std::string, std::string> codecNames(std::string(c->name ? c->name : ""),
+            const std::pair<std::string, std::string> codecNames(std::string(c->name),
                                                            std::string(c->long_name ? c->long_name : ""));
 
             // skip duplicates

Original file line number	Diff line number	Diff line change
`@@ -146,10 +146,10 @@ NamesArray getAvailableVideoCodecsNames()`
`146`	`146`	`{`
`147`	`147`	`if(c->type == AVMEDIA_TYPE_VIDEO)`
`148`	`148`	`{`
`149`		`- if(!c->name && !c->long_name)`
	`149`	`+ if(!c->name)`
`150`	`150`	`continue;`
`151`	`151`
`152`		`- std::pair<std::string, std::string> codecNames(std::string(c->name ? c->name : ""),`
	`152`	`+ std::pair<std::string, std::string> codecNames(std::string(c->name),`
`153`	`153`	`std::string(c->long_name ? c->long_name : ""));`
`154`	`154`
`155`	`155`	`// skip duplicates`
`@@ -171,10 +171,10 @@ NamesArray getAvailableAudioCodecsNames()`
`171`	`171`	`{`
`172`	`172`	`if(c->type == AVMEDIA_TYPE_AUDIO)`
`173`	`173`	`{`
`174`		`- if(!c->name && !c->long_name)`
	`174`	`+ if(!c->name)`
`175`	`175`	`continue;`
`176`	`176`
`177`		`- std::pair<std::string, std::string> codecNames(std::string(c->name ? c->name : ""),`
	`177`	`+ const std::pair<std::string, std::string> codecNames(std::string(c->name),`
`178`	`178`	`std::string(c->long_name ? c->long_name : ""));`
`179`	`179`
`180`	`180`	`// skip duplicates`