ICodec: get codec id / name from AVCodecContext

Clement Champetier · Clement Champetier · commit d40b820d85b2 · 2015-01-16T11:47:52.000+01:00
We are sure to have an allocated AVCodecContext, but not an AVCodec.
diff --git a/src/AvTranscoder/codec/ICodec.cpp b/src/AvTranscoder/codec/ICodec.cpp
@@ -78,14 +78,14 @@ void ICodec::open()
 
 std::string ICodec::getCodecName() const
 {
-	assert( _avCodec != NULL );
-	return avcodec_descriptor_get( _avCodec->id )->name;
+	assert( _avCodecContext != NULL );
+	return avcodec_descriptor_get( _avCodecContext->codec_id )->name;
 }
 
 AVCodecID ICodec::getCodecId() const
 {
-	assert( _avCodec != NULL );
-	return _avCodec->id;
+	assert( _avCodecContext != NULL );
+	return _avCodecContext->codec_id;
 }
 
 int ICodec::getLatency()  const

Original file line number	Diff line number	Diff line change
`@@ -78,14 +78,14 @@ void ICodec::open()`
`78`	`78`
`79`	`79`	`std::string ICodec::getCodecName() const`
`80`	`80`	`{`
`81`		`- assert( _avCodec != NULL );`
`82`		`- return avcodec_descriptor_get( _avCodec->id )->name;`
	`81`	`+ assert( _avCodecContext != NULL );`
	`82`	`+ return avcodec_descriptor_get( _avCodecContext->codec_id )->name;`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`AVCodecID ICodec::getCodecId() const`
`86`	`86`	`{`
`87`		`- assert( _avCodec != NULL );`
`88`		`- return _avCodec->id;`
	`87`	`+ assert( _avCodecContext != NULL );`
	`88`	`+ return _avCodecContext->codec_id;`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`int ICodec::getLatency() const`