Merge pull request #43 from cchampet/fix_FormatContext_export_windows

valnoel · valnoel · commit 955da9239248 · 2015-01-13T14:08:25.000+01:00
Fix exports windows
diff --git a/src/AvTranscoder/Option.hpp b/src/AvTranscoder/Option.hpp
@@ -123,8 +123,8 @@ typedef std::map<std::string, Option> OptionMap;  ///< Key: option name / value:
  * @param av_class: a libav context (could be an AVFormatContext or an AVCodecContext).
  * @param req_flags: libav flag (AV_OPT_FLAG_XXX), which is a filter for AVOption loaded by the Context (default = 0: no flag restriction).
  */
-void loadOptions( OptionMap& outOptions, void* av_class, int req_flags = 0 );
-void loadOptions( OptionArray& outOptions, void* av_class, int req_flags = 0 );
+void AvExport loadOptions( OptionMap& outOptions, void* av_class, int req_flags = 0 );
+void AvExport loadOptions( OptionArray& outOptions, void* av_class, int req_flags = 0 );
 
 }
 
diff --git a/src/AvTranscoder/file/FormatContext.hpp b/src/AvTranscoder/file/FormatContext.hpp
@@ -1,6 +1,7 @@
 #ifndef _AV_TRANSCODER_FORMAT_CONTEXT_HPP_
 #define _AV_TRANSCODER_FORMAT_CONTEXT_HPP_
 
+#include <AvTranscoder/common.hpp>
 #include <AvTranscoder/Option.hpp>
 
 extern "C" {
@@ -13,7 +14,7 @@ namespace avtranscoder
 /**
  * @brief Wrapper of an AVFormatContext.
  */
-class FormatContext
+class AvExport FormatContext
 {
 public:
 	FormatContext( const std::string& filename, int req_flags = 0 );  ///< Allocate an AVFormatContext by opening an input file
diff --git a/src/AvTranscoder/stream/IInputStream.hpp b/src/AvTranscoder/stream/IInputStream.hpp
@@ -9,7 +9,7 @@
 namespace avtranscoder
 {
 
-class IInputStream
+class AvExport IInputStream
 {
 public:
 	virtual ~IInputStream() {};
diff --git a/src/AvTranscoder/stream/IOutputStream.hpp b/src/AvTranscoder/stream/IOutputStream.hpp
@@ -8,7 +8,7 @@
 namespace avtranscoder
 {
 
-class IOutputStream
+class AvExport IOutputStream
 {
 public:
 

Original file line number	Diff line number	Diff line change
`@@ -123,8 +123,8 @@ typedef std::map<std::string, Option> OptionMap; ///< Key: option name / value:`
`123`	`123`	`* @param av_class: a libav context (could be an AVFormatContext or an AVCodecContext).`
`124`	`124`	`* @param req_flags: libav flag (AV_OPT_FLAG_XXX), which is a filter for AVOption loaded by the Context (default = 0: no flag restriction).`
`125`	`125`	`*/`
`126`		`-void loadOptions( OptionMap& outOptions, void* av_class, int req_flags = 0 );`
`127`		`-void loadOptions( OptionArray& outOptions, void* av_class, int req_flags = 0 );`
	`126`	`+void AvExport loadOptions( OptionMap& outOptions, void* av_class, int req_flags = 0 );`
	`127`	`+void AvExport loadOptions( OptionArray& outOptions, void* av_class, int req_flags = 0 );`
`128`	`128`
`129`	`129`	`}`
`130`	`130`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`namespace avtranscoder`
`10`	`10`	`{`
`11`	`11`
`12`		`-class IInputStream`
	`12`	`+class AvExport IInputStream`
`13`	`13`	`{`
`14`	`14`	`public:`
`15`	`15`	`virtual ~IInputStream() {};`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`namespace avtranscoder`
`9`	`9`	`{`
`10`	`10`
`11`		`-class IOutputStream`
	`11`	`+class AvExport IOutputStream`
`12`	`12`	`{`
`13`	`13`	`public:`
`14`	`14`