hotfix: load private FormatContext options only when it's possible

Clement Champetier · Clement Champetier · commit a7864764af60 · 2015-04-27T18:31:00.000+02:00
According to the ffmpeg documentation, priv_data of AVFormatContext is
"... an AVOptions-enabled struct if and only if
iformat/oformat.priv_class is not NULL."
diff --git a/src/AvTranscoder/file/FormatContext.cpp b/src/AvTranscoder/file/FormatContext.cpp
@@ -25,7 +25,8 @@ FormatContext::FormatContext( const std::string& filename, int req_flags, AVDict
 
 	loadOptions( _options, _avFormatContext, req_flags );
 	// when demuxing, priv_data of AVFormatContext is set by avformat_open_input()
-	loadOptions( _options, _avFormatContext->priv_data, req_flags );
+	if( _avFormatContext->iformat->priv_class )
+		loadOptions( _options, _avFormatContext->priv_data, req_flags );
 }
 
 FormatContext::FormatContext( int req_flags )
@@ -91,7 +92,8 @@ void FormatContext::writeHeader( AVDictionary** options )
 		throw std::runtime_error( "could not write header: " + getDescriptionFromErrorCode( ret ) );
 	}
 	// when muxing, priv_data of AVFormatContext is set by avformat_write_header()
-	loadOptions( _options, _avFormatContext->priv_data, _flags );
+	if( _avFormatContext->oformat->priv_class )
+		loadOptions( _options, _avFormatContext->priv_data, _flags );
 }
 
 void FormatContext::writeFrame( AVPacket& packet, bool interleaved )

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,8 @@ FormatContext::FormatContext( const std::string& filename, int req_flags, AVDict`
`25`	`25`
`26`	`26`	`loadOptions( _options, _avFormatContext, req_flags );`
`27`	`27`	`// when demuxing, priv_data of AVFormatContext is set by avformat_open_input()`
`28`		`- loadOptions( _options, _avFormatContext->priv_data, req_flags );`
	`28`	`+ if( _avFormatContext->iformat->priv_class )`
	`29`	`+ loadOptions( _options, _avFormatContext->priv_data, req_flags );`
`29`	`30`	`}`
`30`	`31`
`31`	`32`	`FormatContext::FormatContext( int req_flags )`
`@@ -91,7 +92,8 @@ void FormatContext::writeHeader( AVDictionary** options )`
`91`	`92`	`throw std::runtime_error( "could not write header: " + getDescriptionFromErrorCode( ret ) );`
`92`	`93`	`}`
`93`	`94`	`// when muxing, priv_data of AVFormatContext is set by avformat_write_header()`
`94`		`- loadOptions( _options, _avFormatContext->priv_data, _flags );`
	`95`	`+ if( _avFormatContext->oformat->priv_class )`
	`96`	`+ loadOptions( _options, _avFormatContext->priv_data, _flags );`
`95`	`97`	`}`
`96`	`98`
`97`	`99`	`void FormatContext::writeFrame( AVPacket& packet, bool interleaved )`