diff --git a/src/AvTranscoder/codec/ICodec.cpp b/src/AvTranscoder/codec/ICodec.cpp
index e3ffc407..98d2dba1 100644
--- a/src/AvTranscoder/codec/ICodec.cpp
+++ b/src/AvTranscoder/codec/ICodec.cpp
@@ -43,12 +43,13 @@ ICodec::ICodec( const ECodecType type, AVCodecContext& avCodecContext )
 
 ICodec::~ICodec()
 {
-	if( ! _isCodecContextAllocated )
-		return;
+    avcodec_close(_avCodecContext);
+
+    if(!_isCodecContextAllocated)
+        return;
 
-	avcodec_close( _avCodecContext );
-	av_free( _avCodecContext );
-	_avCodecContext = NULL;
+    av_free(_avCodecContext);
+    _avCodecContext = NULL;
 }
 
 void ICodec::openCodec()
diff --git a/src/AvTranscoder/common.hpp b/src/AvTranscoder/common.hpp
index 8b13b9c7..1f11f277 100644
--- a/src/AvTranscoder/common.hpp
+++ b/src/AvTranscoder/common.hpp
@@ -3,7 +3,7 @@
 
 #define AVTRANSCODER_VERSION_MAJOR 0
 #define AVTRANSCODER_VERSION_MINOR 6
-#define AVTRANSCODER_VERSION_MICRO 1
+#define AVTRANSCODER_VERSION_MICRO 2
 
 #include <AvTranscoder/system.hpp>