Merge pull request #109 from cchampet/clean_common

valnoel · valnoel · commit f67d4c904a4a · 2015-03-04T13:55:40.000+01:00
Clean common
diff --git a/src/AvTranscoder/common.cpp b/src/AvTranscoder/common.cpp
@@ -5,6 +5,10 @@ extern "C" {
 #include <libavutil/error.h>
 }
 
+#ifndef AV_ERROR_MAX_STRING_SIZE
+ #define AV_ERROR_MAX_STRING_SIZE 64
+#endif
+
 namespace avtranscoder
 {
 
diff --git a/src/AvTranscoder/common.hpp b/src/AvTranscoder/common.hpp
@@ -34,10 +34,6 @@ extern "C" {
 #endif
 #endif
 
-#ifndef AV_ERROR_MAX_STRING_SIZE
- #define AV_ERROR_MAX_STRING_SIZE 64
-#endif
-
 #ifndef SWIG
 #if LIBAVCODEC_VERSION_MAJOR < 54
  #define AVPixelFormat PixelFormat
@@ -52,8 +48,6 @@ extern "C" {
 namespace avtranscoder
 {
 
-#define MAX_SWS_PLANE 4
-
 typedef AVRational Rational;
 
 /// Register all the codecs and formats which are enabled at configuration time.
diff --git a/src/AvTranscoder/decoder/VideoDecoder.cpp b/src/AvTranscoder/decoder/VideoDecoder.cpp
@@ -94,8 +94,6 @@ bool VideoDecoder::decodeNextFrame()
 
 		if( ret < 0 )
 		{
-			char err[AV_ERROR_MAX_STRING_SIZE];
-			av_strerror( ret, err, sizeof(err) );
 			throw std::runtime_error( "an error occured during video decoding - " + getDescriptionFromErrorCode( ret ) );
 		}
 	}
diff --git a/src/AvTranscoder/transform/VideoTransform.cpp b/src/AvTranscoder/transform/VideoTransform.cpp
@@ -12,6 +12,8 @@ extern "C" {
 #endif
 }
 
+#define MAX_SWS_PLANE 4
+
 #include <sstream>
 #include <iomanip>
 #include <cassert>

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,10 @@ extern "C" {`
`5`	`5`	`#include <libavutil/error.h>`
`6`	`6`	`}`
`7`	`7`
	`8`	`+#ifndef AV_ERROR_MAX_STRING_SIZE`
	`9`	`+ #define AV_ERROR_MAX_STRING_SIZE 64`
	`10`	`+#endif`
	`11`	`+`
`8`	`12`	`namespace avtranscoder`
`9`	`13`	`{`
`10`	`14`
Original file line number	Diff line number	Diff line change
`@@ -94,8 +94,6 @@ bool VideoDecoder::decodeNextFrame()`
`94`	`94`
`95`	`95`	`if( ret < 0 )`
`96`	`96`	`{`
`97`		`- char err[AV_ERROR_MAX_STRING_SIZE];`
`98`		`- av_strerror( ret, err, sizeof(err) );`
`99`	`97`	`throw std::runtime_error( "an error occured during video decoding - " + getDescriptionFromErrorCode( ret ) );`
`100`	`98`	`}`
`101`	`99`	`}`