util: get codecs without private context when getAvailableOptionsPerVideo/AudioCodec

Clement Champetier · Clement Champetier · commit 558e59c0d058 · 2016-03-09T17:08:41.000+01:00
diff --git a/src/AvTranscoder/util.cpp b/src/AvTranscoder/util.cpp
@@ -216,16 +216,19 @@ OptionArrayMap getAvailableOptionsPerVideoCodec()
     // iterate on codecs
     while(codec)
     {
+        if(!codec->name)
+            continue;
+
         // add only video codec
         if(codec->type == AVMEDIA_TYPE_VIDEO)
         {
+            const std::string videoCodecName(codec->name);
+            OptionArray options;
             if(codec->priv_class)
             {
-                std::string videoCodecName(codec->name);
-                OptionArray options;
                 loadOptions(options, (void*)&codec->priv_class, 0);
-                videoCodecOptions.insert(std::make_pair(videoCodecName, options));
             }
+            videoCodecOptions.insert(std::make_pair(videoCodecName, options));
         }
         codec = av_codec_next(codec);
     }
@@ -241,16 +244,19 @@ OptionArrayMap getAvailableOptionsPerAudioCodec()
     // iterate on codecs
     while(codec)
     {
+        if(!codec->name)
+            continue;
+
         // add only audio codec
         if(codec->type == AVMEDIA_TYPE_AUDIO)
         {
+            const std::string audioCodecName(codec->name);
+            OptionArray options;
             if(codec->priv_class)
             {
-                std::string audioCodecName(codec->name);
-                OptionArray options;
                 loadOptions(options, (void*)&codec->priv_class, 0);
-                audioCodecOptions.insert(std::make_pair(audioCodecName, options));
             }
+            audioCodecOptions.insert(std::make_pair(audioCodecName, options));
         }
         codec = av_codec_next(codec);
     }

Original file line number	Diff line number	Diff line change
`@@ -216,16 +216,19 @@ OptionArrayMap getAvailableOptionsPerVideoCodec()`
`216`	`216`	`// iterate on codecs`
`217`	`217`	`while(codec)`
`218`	`218`	`{`
	`219`	`+ if(!codec->name)`
	`220`	`+ continue;`
	`221`	`+`
`219`	`222`	`// add only video codec`
`220`	`223`	`if(codec->type == AVMEDIA_TYPE_VIDEO)`
`221`	`224`	`{`
	`225`	`+ const std::string videoCodecName(codec->name);`
	`226`	`+ OptionArray options;`
`222`	`227`	`if(codec->priv_class)`
`223`	`228`	`{`
`224`		`- std::string videoCodecName(codec->name);`
`225`		`- OptionArray options;`
`226`	`229`	`loadOptions(options, (void*)&codec->priv_class, 0);`
`227`		`- videoCodecOptions.insert(std::make_pair(videoCodecName, options));`
`228`	`230`	`}`
	`231`	`+ videoCodecOptions.insert(std::make_pair(videoCodecName, options));`
`229`	`232`	`}`
`230`	`233`	`codec = av_codec_next(codec);`
`231`	`234`	`}`
`@@ -241,16 +244,19 @@ OptionArrayMap getAvailableOptionsPerAudioCodec()`
`241`	`244`	`// iterate on codecs`
`242`	`245`	`while(codec)`
`243`	`246`	`{`
	`247`	`+ if(!codec->name)`
	`248`	`+ continue;`
	`249`	`+`
`244`	`250`	`// add only audio codec`
`245`	`251`	`if(codec->type == AVMEDIA_TYPE_AUDIO)`
`246`	`252`	`{`
	`253`	`+ const std::string audioCodecName(codec->name);`
	`254`	`+ OptionArray options;`
`247`	`255`	`if(codec->priv_class)`
`248`	`256`	`{`
`249`		`- std::string audioCodecName(codec->name);`
`250`		`- OptionArray options;`
`251`	`257`	`loadOptions(options, (void*)&codec->priv_class, 0);`
`252`		`- audioCodecOptions.insert(std::make_pair(audioCodecName, options));`
`253`	`258`	`}`
	`259`	`+ audioCodecOptions.insert(std::make_pair(audioCodecName, options));`
`254`	`260`	`}`
`255`	`261`	`codec = av_codec_next(codec);`
`256`	`262`	`}`