From 68d262b8b862969a2118ddb2959a94d49bdc0e42 Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Thu, 31 Jul 2014 11:24:04 +0200
Subject: [PATCH 1/3] Option: fix comment

---
 src/AvTranscoder/Option.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/AvTranscoder/Option.hpp b/src/AvTranscoder/Option.hpp
index 8afbf653..e039cdfd 100644
--- a/src/AvTranscoder/Option.hpp
+++ b/src/AvTranscoder/Option.hpp
@@ -24,7 +24,7 @@ enum OptionType
 	TypeRatio,
 	TypeChoice,
 	TypeGroup,
-	TypeChild, // Option which brelongs to Choice or Group
+	TypeChild, // Option which belongs to Choice or Group
 	TypeUnknown
 };
 

From 5c13b9c2b5f612d26a87cb0bc04ef79b6a8a2853 Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Thu, 31 Jul 2014 11:26:05 +0200
Subject: [PATCH 2/3] OptionLoader: fix loadOptions

* Fix bug when get several child options with the same unit.
* Solution: use multimap instead of map.
---
 src/AvTranscoder/OptionLoader.cpp | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/AvTranscoder/OptionLoader.cpp b/src/AvTranscoder/OptionLoader.cpp
index a388a25d..ebcad95c 100644
--- a/src/AvTranscoder/OptionLoader.cpp
+++ b/src/AvTranscoder/OptionLoader.cpp
@@ -223,7 +223,7 @@ OptionLoader::OptionArray OptionLoader::loadOptions( void* av_class, int req_fla
 {
 	OptionArray options;
 	
-	std::map<std::string, int> optionUnitToIndex;
+	std::multimap<std::string, int> optionUnitToIndex;
 	std::vector<Option> childOptions;
 	
 	const AVOption* avOption = NULL;
@@ -262,19 +262,25 @@ OptionLoader::OptionArray OptionLoader::loadOptions( void* av_class, int req_fla
 	}
 
 	// iterate on child options
-	for( std::vector<Option>::iterator it = childOptions.begin(); it != childOptions.end(); ++it )
+	for( std::vector<Option>::iterator itOption = childOptions.begin(); itOption != childOptions.end(); ++itOption )
 	{
-		int indexParentOption = optionUnitToIndex.at( it->getUnit() );
-		Option& parentOption = options.at( indexParentOption );
-		
-		parentOption.appendChild( *it );
-		
-		// child of a Choice
-		if( parentOption.getType() == TypeChoice )
+		for( std::multimap<std::string, int>::iterator itUnit = optionUnitToIndex.begin(); itUnit != optionUnitToIndex.end(); ++itUnit )
 		{
-			if( it->getDefaultValueInt() == parentOption.getDefaultValueInt() )
-				parentOption.setDefaultChildIndex( parentOption.getNbChilds() - 1 );
-		}
+			if( itUnit->first == itOption->getUnit() )
+			{
+				int indexParentOption = itUnit->second;
+				Option& parentOption = options.at( indexParentOption );
+
+				parentOption.appendChild( *itOption );
+
+				// child of a Choice
+				if( parentOption.getType() == TypeChoice )
+				{
+					if( itOption->getDefaultValueInt() == parentOption.getDefaultValueInt() )
+						parentOption.setDefaultChildIndex( parentOption.getNbChilds() - 1 );
+				}
+			}
+        }
 	}
 	return options;
 }

From 6d7c48f089f1fcab9f286b4ee47392debe5ea869 Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Thu, 31 Jul 2014 11:26:47 +0200
Subject: [PATCH 3/3] OptionLoader: clean

---
 src/AvTranscoder/OptionLoader.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/AvTranscoder/OptionLoader.cpp b/src/AvTranscoder/OptionLoader.cpp
index ebcad95c..1727dd0f 100644
--- a/src/AvTranscoder/OptionLoader.cpp
+++ b/src/AvTranscoder/OptionLoader.cpp
@@ -244,8 +244,6 @@ OptionLoader::OptionArray OptionLoader::loadOptions( void* av_class, int req_fla
 
 		OptionType optionType = Option::getTypeFromAVOption( avOption->unit, avOption->type );
 
-		//std::cout << "The option is " << avOption->name << " of type : " << avOption->type << std::endl;
-
 		if( optionType == TypeChild )
 		{
 			childOptions.push_back( Option( *avOption, optionType ) );