From b13929330bb8cd81da9eeef1d33a8eb366354950 Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Tue, 24 Nov 2015 16:47:08 +0100
Subject: [PATCH 1/2] SWIG: ignore OptionMap type

* Cannot be bound (see issue #152).
* In scripted langages, we prefer to use OptionArray (iterable).
---
 src/AvTranscoder/Option.hpp             | 2 ++
 src/AvTranscoder/codec/ICodec.hpp       | 3 ++-
 src/AvTranscoder/file/FormatContext.hpp | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/AvTranscoder/Option.hpp b/src/AvTranscoder/Option.hpp
index 87f09218..80717b50 100644
--- a/src/AvTranscoder/Option.hpp
+++ b/src/AvTranscoder/Option.hpp
@@ -118,6 +118,7 @@ class AvExport Option
 typedef std::vector<Option> OptionArray;
 typedef std::map<std::string, Option> OptionMap;  ///< Key: option name / value: option
 
+#ifndef SWIG
 /**
  * @param outOptions: map or array of options
  * @param av_class: a libav context (could be an AVFormatContext or an AVCodecContext).
@@ -125,6 +126,7 @@ typedef std::map<std::string, Option> OptionMap;  ///< Key: option name / value:
  */
 void AvExport loadOptions( OptionMap& outOptions, void* av_class, int req_flags = 0 );
 void AvExport loadOptions( OptionArray& outOptions, void* av_class, int req_flags = 0 );
+#endif
 
 }
 
diff --git a/src/AvTranscoder/codec/ICodec.hpp b/src/AvTranscoder/codec/ICodec.hpp
index d1257bf8..ac4e9d8a 100644
--- a/src/AvTranscoder/codec/ICodec.hpp
+++ b/src/AvTranscoder/codec/ICodec.hpp
@@ -44,8 +44,9 @@ class AvExport ICodec
 	int getLatency() const;
 
 	OptionArray getOptions();  ///< Get options as array
+#ifndef SWIG
 	OptionMap& getOptionsMap() { return _options; }  ///< Get options as map
-
+#endif
 	Option& getOption( const std::string& optionName ) { return _options.at(optionName); }
 	
 #ifndef SWIG
diff --git a/src/AvTranscoder/file/FormatContext.hpp b/src/AvTranscoder/file/FormatContext.hpp
index 7c080531..b8b361df 100644
--- a/src/AvTranscoder/file/FormatContext.hpp
+++ b/src/AvTranscoder/file/FormatContext.hpp
@@ -88,8 +88,9 @@ class AvExport FormatContext
 	size_t getStartTime() const { return _avFormatContext->start_time; }
 
 	OptionArray getOptions();  ///< Get options as array
+#ifndef SWIG
 	OptionMap& getOptionsMap() { return _options; }  ///< Get options as map
-
+#endif
 	Option& getOption( const std::string& optionName ) { return _options.at(optionName); }
 
 	/**

From 55adb30b232580149f77f86227ff95499119cf7e Mon Sep 17 00:00:00 2001
From: Clement Champetier <cnt@mikrosimage.eu>
Date: Tue, 24 Nov 2015 17:12:37 +0100
Subject: [PATCH 2/2] SWIG: ignore OptionArrayMap and NamesArray types

---
 src/AvTranscoder/util.hpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/AvTranscoder/util.hpp b/src/AvTranscoder/util.hpp
index 257be39d..aa0ddc24 100644
--- a/src/AvTranscoder/util.hpp
+++ b/src/AvTranscoder/util.hpp
@@ -48,6 +48,7 @@ AVPixelFormat AvExport getAVPixelFormat( const std::string& pixelFormat );
 */
 AVSampleFormat AvExport getAVSampleFormat( const std::string& sampleFormat );
 
+#ifndef SWIG
 /**
  * @brief Get array of short/long names of all format supported by FFmpeg / libav.
  */
@@ -77,6 +78,7 @@ OptionArrayMap AvExport getVideoCodecOptions();
  * @brief Get the list of options for each audio codec
  */
 OptionArrayMap AvExport getAudioCodecOptions();
+#endif
 
 }