FormatContext: add AVDictionary parameter in constructor

Clement Champetier · Clement Champetier · commit 2fd9834abd8d · 2015-04-24T17:24:59.000+02:00
diff --git a/src/AvTranscoder/file/FormatContext.cpp b/src/AvTranscoder/file/FormatContext.cpp
@@ -6,12 +6,12 @@
 namespace avtranscoder
 {
 
-FormatContext::FormatContext( const std::string& filename, int req_flags )
+FormatContext::FormatContext( const std::string& filename, int req_flags, AVDictionary** options )
 	: _avFormatContext( NULL )
 	, _options()
 	, _isOpen( false )
 {
-	int ret = avformat_open_input( &_avFormatContext, filename.c_str(), NULL, NULL );
+	int ret = avformat_open_input( &_avFormatContext, filename.c_str(), NULL, options );
 	if( ret < 0 )
 	{
 		std::string msg = "unable to open file ";
diff --git a/src/AvTranscoder/file/FormatContext.hpp b/src/AvTranscoder/file/FormatContext.hpp
@@ -21,8 +21,16 @@ class AvExport FormatContext
 	FormatContext& operator=( const FormatContext& formatContext );
 
 public:
-	FormatContext( const std::string& filename, int req_flags = 0 );  ///< Allocate an AVFormatContext by opening an input file
-	FormatContext( int req_flags = 0 );  ///< Allocate an AVFormatContext with default values
+	/**
+	 * @brief Allocate an AVFormatContext by opening an input file
+         */
+	FormatContext( const std::string& filename, int req_flags = 0, AVDictionary** options = NULL );
+
+	/**
+	 * @brief Allocate an AVFormatContext with default values
+         */
+	FormatContext( int req_flags = 0 );
+
 	~FormatContext();
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -6,12 +6,12 @@`
`6`	`6`	`namespace avtranscoder`
`7`	`7`	`{`
`8`	`8`
`9`		`-FormatContext::FormatContext( const std::string& filename, int req_flags )`
	`9`	`+FormatContext::FormatContext( const std::string& filename, int req_flags, AVDictionary** options )`
`10`	`10`	`: _avFormatContext( NULL )`
`11`	`11`	`, _options()`
`12`	`12`	`, _isOpen( false )`
`13`	`13`	`{`
`14`		`- int ret = avformat_open_input( &_avFormatContext, filename.c_str(), NULL, NULL );`
	`14`	`+ int ret = avformat_open_input( &_avFormatContext, filename.c_str(), NULL, options );`
`15`	`15`	`if( ret < 0 )`
`16`	`16`	`{`
`17`	`17`	`std::string msg = "unable to open file ";`