FormatContext: fix isOpen value when open AVFormatContext

Clement Champetier · Clement Champetier · commit 4da5603af6fd · 2015-01-21T18:05:28.000+01:00
diff --git a/src/AvTranscoder/file/FormatContext.cpp b/src/AvTranscoder/file/FormatContext.cpp
@@ -10,7 +10,7 @@ namespace avtranscoder
 FormatContext::FormatContext( const std::string& filename, int req_flags )
 	: _avFormatContext( NULL )
 	, _options()
-	, _isOpen( true )
+	, _isOpen( false )
 {
 	int ret = avformat_open_input( &_avFormatContext, filename.c_str(), NULL, NULL );
 	if( ret < 0 )
@@ -23,6 +23,7 @@ FormatContext::FormatContext( const std::string& filename, int req_flags )
 		msg += err;
 		throw std::ios_base::failure( msg );
 	}
+	_isOpen = true;
 	loadOptions( _options, _avFormatContext, req_flags );
 }
 
diff --git a/src/AvTranscoder/file/FormatContext.hpp b/src/AvTranscoder/file/FormatContext.hpp
@@ -86,7 +86,7 @@ class AvExport FormatContext
 private:
 	AVFormatContext* _avFormatContext;  ///< Has ownership
 	OptionMap _options;
-	const bool _isOpen;  ///< Is the AVFormatContext open (in constructor with a filename)
+	bool _isOpen;  ///< Is the AVFormatContext open (in constructor with a filename)
 };
 
 }

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ namespace avtranscoder`
`10`	`10`	`FormatContext::FormatContext( const std::string& filename, int req_flags )`
`11`	`11`	`: _avFormatContext( NULL )`
`12`	`12`	`, _options()`
`13`		`- , _isOpen( true )`
	`13`	`+ , _isOpen( false )`
`14`	`14`	`{`
`15`	`15`	`int ret = avformat_open_input( &_avFormatContext, filename.c_str(), NULL, NULL );`
`16`	`16`	`if( ret < 0 )`
`@@ -23,6 +23,7 @@ FormatContext::FormatContext( const std::string& filename, int req_flags )`
`23`	`23`	`msg += err;`
`24`	`24`	`throw std::ios_base::failure( msg );`
`25`	`25`	`}`
	`26`	`+ _isOpen = true;`
`26`	`27`	`loadOptions( _options, _avFormatContext, req_flags );`
`27`	`28`	`}`
`28`	`29`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ class AvExport FormatContext`
`86`	`86`	`private:`
`87`	`87`	`AVFormatContext* _avFormatContext; ///< Has ownership`
`88`	`88`	`OptionMap _options;`
`89`		`- const bool _isOpen; ///< Is the AVFormatContext open (in constructor with a filename)`
	`89`	`+ bool _isOpen; ///< Is the AVFormatContext open (in constructor with a filename)`
`90`	`90`	`};`
`91`	`91`
`92`	`92`	`}`