Merge pull request #205 from fabiencastan/dev_codecNotAvailable

cchampet · cchampet · commit 7566857f67d9 · 2015-07-16T11:28:25.000+02:00
ICodec: throw if codec is not available
diff --git a/src/AvTranscoder/codec/ICodec.cpp b/src/AvTranscoder/codec/ICodec.cpp
@@ -82,7 +82,11 @@ void ICodec::openCodec()
 std::string ICodec::getCodecName() const
 {
 	assert( _avCodecContext != NULL );
-	return avcodec_descriptor_get( _avCodecContext->codec_id )->name;
+	const AVCodecDescriptor * desc = avcodec_descriptor_get( _avCodecContext->codec_id );
+	if( ! desc )
+                throw std::runtime_error( "Codec Descriptor is not available." );
+
+	return desc->name;
 }
 
 AVCodecID ICodec::getCodecId() const

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,11 @@ void ICodec::openCodec()`
`82`	`82`	`std::string ICodec::getCodecName() const`
`83`	`83`	`{`
`84`	`84`	`assert( _avCodecContext != NULL );`
`85`		`- return avcodec_descriptor_get( _avCodecContext->codec_id )->name;`
	`85`	`+ const AVCodecDescriptor * desc = avcodec_descriptor_get( _avCodecContext->codec_id );`
	`86`	`+ if( ! desc )`
	`87`	`+ throw std::runtime_error( "Codec Descriptor is not available." );`
	`88`	`+`
	`89`	`+ return desc->name;`
`86`	`90`	`}`
`87`	`91`
`88`	`92`	`AVCodecID ICodec::getCodecId() const`