Merge pull request #69 from mikrosimage/minor_build_fixes

cchampet · cchampet · commit a08947d3d83f · 2015-01-27T17:05:31.000+01:00
Minor build fixes
diff --git a/src/AvTranscoder/Option.cpp b/src/AvTranscoder/Option.cpp
@@ -2,6 +2,7 @@
 
 extern "C" {
 #include <libavutil/error.h>
+#include <libavutil/mem.h>
 }
 
 #include <iostream>
diff --git a/src/AvTranscoder/codec/AudioCodec.cpp b/src/AvTranscoder/codec/AudioCodec.cpp
@@ -1,5 +1,6 @@
 #include "AudioCodec.hpp"
 
+#include <cmath>
 #include <cassert>
 
 namespace avtranscoder
@@ -25,7 +26,7 @@ AudioFrameDesc AudioCodec::getAudioFrameDesc() const
 	assert( _avCodecContext != NULL );
 	AudioFrameDesc audioFrameDesc( _avCodecContext->sample_rate, _avCodecContext->channels, _avCodecContext->sample_fmt );
 	double fps = 1.0 * _avCodecContext->time_base.den / ( _avCodecContext->time_base.num * _avCodecContext->ticks_per_frame );
-	if( ! isinf( fps ) )
+	if( ! std::isinf( fps ) )
 		audioFrameDesc.setFps( fps );
 	return audioFrameDesc;
 }
diff --git a/src/AvTranscoder/codec/VideoCodec.cpp b/src/AvTranscoder/codec/VideoCodec.cpp
@@ -1,5 +1,6 @@
 #include "VideoCodec.hpp"
 
+#include <cmath>
 #include <cassert>
 
 namespace avtranscoder
@@ -25,7 +26,7 @@ VideoFrameDesc VideoCodec::getVideoFrameDesc() const
 	assert( _avCodecContext != NULL );
 	VideoFrameDesc videoFrameDesc( _avCodecContext->width, _avCodecContext->height, _avCodecContext->pix_fmt );
 	double fps = 1.0 * _avCodecContext->time_base.den / ( _avCodecContext->time_base.num * _avCodecContext->ticks_per_frame );
-	if( ! isinf( fps ) )
+	if( ! std::isinf( fps ) )
 		videoFrameDesc.setFps( fps );
 	return videoFrameDesc;
 }
diff --git a/src/AvTranscoder/file/FormatContext.cpp b/src/AvTranscoder/file/FormatContext.cpp
@@ -133,7 +133,8 @@ void FormatContext::addMetaData( const std::string& key, const std::string& valu
 
 AVStream& FormatContext::addAVStream( const AVCodec& avCodec )
 {
-	AVStream* stream = avformat_new_stream( _avFormatContext, &avCodec );
+	// Need const_cast<AVCodec*> for libav versions < 54.34.
+	AVStream* stream = avformat_new_stream( _avFormatContext, const_cast<AVCodec*>(&avCodec) );
 	if( stream == NULL )
 	{
 		throw std::runtime_error( "unable to add new video stream" );
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -7,10 +7,12 @@ find_package(FFmpeg
 	COMPONENTS avcodec avformat avutil swscale swresample avresample)
 
 # Check if FFmpeg or libav dependency
-if(EXISTS "${FFMPEG_INCLUDE_DIR}/libavresample/avresample.h")
+if(avresample_VERSION)
 	add_definitions(-DAV_RESAMPLE_LIBRARY)
-else()
+elseif(swresample_VERSION)
 	add_definitions(-DFF_RESAMPLE_LIBRARY)
+else()
+        message(SEND_ERROR, "Need 'swresample' or 'avresample'.")
 endif()
 
 # Include AvTranscoder and FFmpeg

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`extern "C" {`
`4`	`4`	`#include <libavutil/error.h>`
	`5`	`+#include <libavutil/mem.h>`
`5`	`6`	`}`
`6`	`7`
`7`	`8`	`#include <iostream>`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,8 @@ void FormatContext::addMetaData( const std::string& key, const std::string& valu`
`133`	`133`
`134`	`134`	`AVStream& FormatContext::addAVStream( const AVCodec& avCodec )`
`135`	`135`	`{`
`136`		`- AVStream* stream = avformat_new_stream( _avFormatContext, &avCodec );`
	`136`	`+ // Need const_cast<AVCodec*> for libav versions < 54.34.`
	`137`	`+ AVStream* stream = avformat_new_stream( _avFormatContext, const_cast<AVCodec*>(&avCodec) );`
`137`	`138`	`if( stream == NULL )`
`138`	`139`	`{`
`139`	`140`	`throw std::runtime_error( "unable to add new video stream" );`