FormatContext: fix close of AVFormatContext only if is open

Clement Champetier · Clement Champetier · commit 90e3e5d5b759 · 2015-01-21T18:04:49.000+01:00
The desctructor of the class will be called when throw exception in
functions.
diff --git a/src/AvTranscoder/file/FormatContext.cpp b/src/AvTranscoder/file/FormatContext.cpp
@@ -39,7 +39,7 @@ FormatContext::~FormatContext()
 {
 	if( ! _avFormatContext )
 		return;
-	
+
 	if( _isOpen )
 		avformat_close_input( &_avFormatContext );
 	else
@@ -52,7 +52,6 @@ void FormatContext::findStreamInfo( AVDictionary** options )
 	int err = avformat_find_stream_info( _avFormatContext, options );
 	if( err < 0 )
 	{
-		avformat_close_input( &_avFormatContext );
 		throw std::ios_base::failure( "unable to find stream informations" );
 	}
 }
@@ -65,7 +64,6 @@ void FormatContext::openRessource( const std::string& url, int flags )
 	int err = avio_open2( &_avFormatContext->pb, url.c_str(), flags, NULL, NULL );
 	if( err < 0 )
 	{
-		avformat_close_input( &_avFormatContext );
 		throw std::ios_base::failure( "error when opening output format" );
 	}
 }
@@ -78,7 +76,6 @@ void FormatContext::closeRessource()
 	int err = avio_close( _avFormatContext->pb );
 	if( err < 0 )
 	{
-		avformat_close_input( &_avFormatContext );
 		throw std::ios_base::failure( "error when close output format" );
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ FormatContext::~FormatContext()`
`39`	`39`	`{`
`40`	`40`	`if( ! _avFormatContext )`
`41`	`41`	`return;`
`42`		`-`
	`42`	`+`
`43`	`43`	`if( _isOpen )`
`44`	`44`	`avformat_close_input( &_avFormatContext );`
`45`	`45`	`else`
`@@ -52,7 +52,6 @@ void FormatContext::findStreamInfo( AVDictionary** options )`
`52`	`52`	`int err = avformat_find_stream_info( _avFormatContext, options );`
`53`	`53`	`if( err < 0 )`
`54`	`54`	`{`
`55`		`- avformat_close_input( &_avFormatContext );`
`56`	`55`	`throw std::ios_base::failure( "unable to find stream informations" );`
`57`	`56`	`}`
`58`	`57`	`}`
`@@ -65,7 +64,6 @@ void FormatContext::openRessource( const std::string& url, int flags )`
`65`	`64`	`int err = avio_open2( &_avFormatContext->pb, url.c_str(), flags, NULL, NULL );`
`66`	`65`	`if( err < 0 )`
`67`	`66`	`{`
`68`		`- avformat_close_input( &_avFormatContext );`
`69`	`67`	`throw std::ios_base::failure( "error when opening output format" );`
`70`	`68`	`}`
`71`	`69`	`}`
`@@ -78,7 +76,6 @@ void FormatContext::closeRessource()`
`78`	`76`	`int err = avio_close( _avFormatContext->pb );`
`79`	`77`	`if( err < 0 )`
`80`	`78`	`{`
`81`		`- avformat_close_input( &_avFormatContext );`
`82`	`79`	`throw std::ios_base::failure( "error when close output format" );`
`83`	`80`	`}`
`84`	`81`	`}`