From 88dc3d060594d206bb08e7e7e4c529b012f7cab3 Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Thu, 4 Sep 2014 15:14:36 +0200
Subject: [PATCH 1/2] Option: fix get type of AVOption

An AVOption corresponds to a choice if it has a unit and a type of
AV_OPT_TYPE_INT or AV_OPT_TYPE_INT64.
---
 src/AvTranscoder/Option.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/AvTranscoder/Option.cpp b/src/AvTranscoder/Option.cpp
index bbf8bb49..fa552612 100644
--- a/src/AvTranscoder/Option.cpp
+++ b/src/AvTranscoder/Option.cpp
@@ -16,7 +16,7 @@ OptionType Option::getTypeFromAVOption( const char* unit, AVOptionType avType )
 {
 	if( unit && avType == AV_OPT_TYPE_FLAGS )
 		return TypeGroup;
-	else if( unit && avType == AV_OPT_TYPE_INT )
+	else if( unit && ( avType == AV_OPT_TYPE_INT || avType == AV_OPT_TYPE_INT64 ) )
 		return TypeChoice;
 	else if( unit && avType == AV_OPT_TYPE_CONST )
 		return TypeChild;

From 52f3e9f0b256d3ea019c29b71290a944dfc1a9b7 Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Thu, 4 Sep 2014 15:17:17 +0200
Subject: [PATCH 2/2] OptionLoader: warning if found a child option with no
 parent option

---
 src/AvTranscoder/OptionLoader.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/AvTranscoder/OptionLoader.cpp b/src/AvTranscoder/OptionLoader.cpp
index 1727dd0f..09da7fba 100644
--- a/src/AvTranscoder/OptionLoader.cpp
+++ b/src/AvTranscoder/OptionLoader.cpp
@@ -262,6 +262,7 @@ OptionLoader::OptionArray OptionLoader::loadOptions( void* av_class, int req_fla
 	// iterate on child options
 	for( std::vector<Option>::iterator itOption = childOptions.begin(); itOption != childOptions.end(); ++itOption )
 	{
+		bool parentFound = false;
 		for( std::multimap<std::string, int>::iterator itUnit = optionUnitToIndex.begin(); itUnit != optionUnitToIndex.end(); ++itUnit )
 		{
 			if( itUnit->first == itOption->getUnit() )
@@ -277,8 +278,16 @@ OptionLoader::OptionArray OptionLoader::loadOptions( void* av_class, int req_fla
 					if( itOption->getDefaultValueInt() == parentOption.getDefaultValueInt() )
 						parentOption.setDefaultChildIndex( parentOption.getNbChilds() - 1 );
 				}
+
+				parentFound = true;
+				break;
 			}
         }
+
+		if( ! parentFound )
+		{
+			std::cout << "Warning: Can't find a choice option for " << itOption->getName() << std::endl;
+		}
 	}
 	return options;
 }