ICodec: load specific codec options

Clement Champetier · Clement Champetier · commit 204f9756a612 · 2015-01-16T11:44:06.000+01:00
diff --git a/src/AvTranscoder/codec/ICodec.cpp b/src/AvTranscoder/codec/ICodec.cpp
@@ -139,7 +139,6 @@ void ICodec::setCodec( const ECodecType type, const AVCodecID codecId )
 	}
 }
 
-
 void ICodec::allocateContext()
 {
 	_avCodecContext = avcodec_alloc_context3( _avCodec );
@@ -152,9 +151,17 @@ void ICodec::allocateContext()
 void ICodec::loadCodecOptions()
 {
 	if( _type == eCodecTypeEncoder )
+	{
 		loadOptions( _options, _avCodecContext, AV_OPT_FLAG_ENCODING_PARAM );
+		// load specific options of the codec
+		loadOptions( _options, _avCodecContext->priv_data, AV_OPT_FLAG_ENCODING_PARAM );
+	}
 	else if( _type == eCodecTypeDecoder )
+	{
 		loadOptions( _options, _avCodecContext, AV_OPT_FLAG_DECODING_PARAM );
+		// load specific options of the codec
+		loadOptions( _options, _avCodecContext->priv_data, AV_OPT_FLAG_DECODING_PARAM );
+	}
 }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,6 @@ void ICodec::setCodec( const ECodecType type, const AVCodecID codecId )`
`139`	`139`	`}`
`140`	`140`	`}`
`141`	`141`
`142`		`-`
`143`	`142`	`void ICodec::allocateContext()`
`144`	`143`	`{`
`145`	`144`	`_avCodecContext = avcodec_alloc_context3( _avCodec );`
`@@ -152,9 +151,17 @@ void ICodec::allocateContext()`
`152`	`151`	`void ICodec::loadCodecOptions()`
`153`	`152`	`{`
`154`	`153`	`if( _type == eCodecTypeEncoder )`
	`154`	`+ {`
`155`	`155`	`loadOptions( _options, _avCodecContext, AV_OPT_FLAG_ENCODING_PARAM );`
	`156`	`+ // load specific options of the codec`
	`157`	`+ loadOptions( _options, _avCodecContext->priv_data, AV_OPT_FLAG_ENCODING_PARAM );`
	`158`	`+ }`
`156`	`159`	`else if( _type == eCodecTypeDecoder )`
	`160`	`+ {`
`157`	`161`	`loadOptions( _options, _avCodecContext, AV_OPT_FLAG_DECODING_PARAM );`
	`162`	`+ // load specific options of the codec`
	`163`	`+ loadOptions( _options, _avCodecContext->priv_data, AV_OPT_FLAG_DECODING_PARAM );`
	`164`	`+ }`
`158`	`165`	`}`
`159`	`166`
`160`	`167`	`}`