From f14cddf923683dc1dd5f3215afe9d979824b4d48 Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Thu, 16 Apr 2015 12:15:42 +0200
Subject: [PATCH 1/5] util - getVideo/AudioCodecOptions: don't skip codecs
 without encode function

---
 src/AvTranscoder/util.cpp | 46 ++++++++++++++-------------------------
 1 file changed, 16 insertions(+), 30 deletions(-)

diff --git a/src/AvTranscoder/util.cpp b/src/AvTranscoder/util.cpp
index d85bf193..afdfaa19 100644
--- a/src/AvTranscoder/util.cpp
+++ b/src/AvTranscoder/util.cpp
@@ -229,29 +229,22 @@ OptionArrayMap getOutputFormatOptions()
 
 OptionArrayMap getVideoCodecOptions()
 {
-	std::map< std::string, std::vector<Option> > videoCodecOptions;
+	OptionArrayMap videoCodecOptions;
 	
 	AVCodec* codec = av_codec_next( NULL );
 	
 	// iterate on codecs
 	while( codec )
 	{
-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 53, 34, 0 )
-		if( codec->encode )
-#else
-		if( codec->encode2 )
-#endif
+		// add only video codec
+		if( codec->type == AVMEDIA_TYPE_VIDEO )
 		{
-			// add only video codec
-			if( codec->type == AVMEDIA_TYPE_VIDEO )
+			if( codec->priv_class )
 			{
-				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 ) );
-				}
+				std::string videoCodecName( codec->name );
+				OptionArray options;
+				loadOptions( options, (void*)&codec->priv_class, 0  );
+				videoCodecOptions.insert( std::make_pair( videoCodecName, options ) );
 			}
 		}
 		codec = av_codec_next( codec );
@@ -261,29 +254,22 @@ OptionArrayMap getVideoCodecOptions()
 
 OptionArrayMap getAudioCodecOptions()
 {
-	std::map< std::string, std::vector<Option> > audioCodecOptions;
+	OptionArrayMap audioCodecOptions;
 	
 	AVCodec* codec = av_codec_next( NULL );
 	
 	// iterate on codecs
 	while( codec )
 	{
-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 53, 34, 0 )
-		if( codec->encode )
-#else
-		if( codec->encode2 )
-#endif
+		// add only audio codec
+		if( codec->type == AVMEDIA_TYPE_AUDIO )
 		{
-			// add only audio codec
-			if( codec->type == AVMEDIA_TYPE_AUDIO )
+			if( codec->priv_class )
 			{
-				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 ) );
-				}
+				std::string audioCodecName( codec->name );
+				OptionArray options;
+				loadOptions( options, (void*)&codec->priv_class, 0  );
+				audioCodecOptions.insert( std::make_pair( audioCodecName, options ) );
 			}
 		}
 		codec = av_codec_next( codec );

From 7efb61212c408fd4237fb656f225b567f4151603 Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Thu, 16 Apr 2015 12:16:11 +0200
Subject: [PATCH 2/5] util - getOutputFormatOptions: clean

---
 src/AvTranscoder/util.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/AvTranscoder/util.cpp b/src/AvTranscoder/util.cpp
index afdfaa19..acab3454 100644
--- 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 ) );

From ed6eaf077006e39d8ca45d821bc16730505b46b5 Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Thu, 16 Apr 2015 12:18:29 +0200
Subject: [PATCH 3/5] util: getVideo/AudioCodecsNames: don't skip codecs
 without encode function

---
 src/AvTranscoder/util.cpp | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/src/AvTranscoder/util.cpp b/src/AvTranscoder/util.cpp
index acab3454..8c013162 100644
--- a/src/AvTranscoder/util.cpp
+++ b/src/AvTranscoder/util.cpp
@@ -144,13 +144,6 @@ NamesArray getVideoCodecsNames()
 	AVCodec* c = NULL;
 	while( ( c = av_codec_next( c ) ) != NULL )
 	{
-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 53, 34, 0 )
-		if( ! c->encode )
-			continue;
-#else
-		if( ! c->encode2 )
-			continue;
-#endif
 		switch( c->type )
 		{
 			case AVMEDIA_TYPE_VIDEO:
@@ -175,13 +168,6 @@ NamesArray getAudioCodecsNames()
 	AVCodec* c = NULL;
 	while( ( c = av_codec_next( c ) ) != NULL )
 	{
-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 53, 34, 0 )
-		if( ! c->encode )
-			continue;
-#else
-		if( ! c->encode2 )
-			continue;
-#endif
 		switch( c->type )
 		{
 			case AVMEDIA_TYPE_AUDIO:

From 1127853b92c669538c029bcc0a40b4b23d201f3d Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Thu, 16 Apr 2015 12:20:14 +0200
Subject: [PATCH 4/5] util: getVideo/AudioCodecsNames: clean

---
 src/AvTranscoder/util.cpp | 30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/src/AvTranscoder/util.cpp b/src/AvTranscoder/util.cpp
index 8c013162..20a36de2 100644
--- a/src/AvTranscoder/util.cpp
+++ b/src/AvTranscoder/util.cpp
@@ -144,18 +144,13 @@ NamesArray getVideoCodecsNames()
 	AVCodec* c = NULL;
 	while( ( c = av_codec_next( c ) ) != NULL )
 	{
-		switch( c->type )
+		if( c->type == AVMEDIA_TYPE_VIDEO)
 		{
-			case AVMEDIA_TYPE_VIDEO:
-			{
-				if( ! c->name && ! c->long_name )
-					continue;
+			if( ! c->name && ! c->long_name )
+				continue;
 
-				videoCodecsNames.push_back( std::make_pair( std::string( c->name ? c->name : "" ), std::string( c->long_name ? c->long_name : "" ) ) );
-				break;
-			}
-			default:
-				break;
+			std::pair< std::string, std::string > codecNames( std::string( c->name ? c->name : "" ), std::string( c->long_name ? c->long_name : "" ) );
+			videoCodecsNames.push_back( codecNames );
 		}
 	}
 	return videoCodecsNames;
@@ -168,18 +163,13 @@ NamesArray getAudioCodecsNames()
 	AVCodec* c = NULL;
 	while( ( c = av_codec_next( c ) ) != NULL )
 	{
-		switch( c->type )
+		if( c->type == AVMEDIA_TYPE_AUDIO )
 		{
-			case AVMEDIA_TYPE_AUDIO:
-			{
-				if( ! c->name && ! c->long_name )
-					continue;
+			if( ! c->name && ! c->long_name )
+				continue;
 
-				audioCodecsNames.push_back( std::make_pair( std::string( c->name ? c->name : "" ), std::string( c->long_name ? c->long_name : "" ) ) );
-				break;
-			}
-			default:
-				break;
+			std::pair< std::string, std::string > codecNames( std::string( c->name ? c->name : "" ), std::string( c->long_name ? c->long_name : "" ) );
+			audioCodecsNames.push_back( codecNames );
 		}
 	}
 	return audioCodecsNames;

From b826dc2ea7553264f38419388417e93ef2d5568d Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Thu, 16 Apr 2015 12:20:47 +0200
Subject: [PATCH 5/5] util: getVideo/AudioCodecsNames: skip duplicates

---
 src/AvTranscoder/util.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/AvTranscoder/util.cpp b/src/AvTranscoder/util.cpp
index 20a36de2..a98376e1 100644
--- a/src/AvTranscoder/util.cpp
+++ b/src/AvTranscoder/util.cpp
@@ -7,6 +7,7 @@ extern "C" {
 }
 
 #include <utility>
+#include <algorithm>
 
 namespace avtranscoder
 {
@@ -150,6 +151,11 @@ NamesArray getVideoCodecsNames()
 				continue;
 
 			std::pair< std::string, std::string > codecNames( std::string( c->name ? c->name : "" ), std::string( c->long_name ? c->long_name : "" ) );
+
+			// skip duplicates
+			if( std::find( videoCodecsNames.begin(), videoCodecsNames.end(), codecNames ) != videoCodecsNames.end() )
+				continue;
+
 			videoCodecsNames.push_back( codecNames );
 		}
 	}
@@ -169,6 +175,11 @@ NamesArray getAudioCodecsNames()
 				continue;
 
 			std::pair< std::string, std::string > codecNames( std::string( c->name ? c->name : "" ), std::string( c->long_name ? c->long_name : "" ) );
+
+			// skip duplicates
+			if( std::find( audioCodecsNames.begin(), audioCodecsNames.end(), codecNames ) != audioCodecsNames.end() )
+				continue;
+
 			audioCodecsNames.push_back( codecNames );
 		}
 	}