Merge branch 'master' into develop

Clement Champetier · Clement Champetier · commit 2b994540ae7a · 2016-01-06T09:34:07.000+01:00
Conflicts:
	src/AvTranscoder/codec/ICodec.cpp
diff --git a/src/AvTranscoder/codec/ICodec.cpp b/src/AvTranscoder/codec/ICodec.cpp
@@ -44,10 +44,11 @@ ICodec::ICodec(const ECodecType type, AVCodecContext& avCodecContext)
 
 ICodec::~ICodec()
 {
+    avcodec_close(_avCodecContext);
+
     if(!_isCodecContextAllocated)
         return;
 
-    avcodec_close(_avCodecContext);
     av_free(_avCodecContext);
     _avCodecContext = NULL;
 }
diff --git 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>
 

Original file line number	Diff line number	Diff line change
`@@ -44,10 +44,11 @@ ICodec::ICodec(const ECodecType type, AVCodecContext& avCodecContext)`
`44`	`44`
`45`	`45`	`ICodec::~ICodec()`
`46`	`46`	`{`
	`47`	`+ avcodec_close(_avCodecContext);`
	`48`	`+`
`47`	`49`	`if(!_isCodecContextAllocated)`
`48`	`50`	`return;`
`49`	`51`
`50`		`- avcodec_close(_avCodecContext);`
`51`	`52`	`av_free(_avCodecContext);`
`52`	`53`	`_avCodecContext = NULL;`
`53`	`54`	`}`