From 4417c6452b09894ae49fe134882bd1818046245e Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Mon, 7 Nov 2016 17:15:08 +0100 Subject: [PATCH 1/2] transform: fix warning at compile time These are fast-forward declarations of ffmpeg C structs. --- src/AvTranscoder/transform/AudioTransform.hpp | 2 +- src/AvTranscoder/transform/VideoTransform.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/AvTranscoder/transform/AudioTransform.hpp b/src/AvTranscoder/transform/AudioTransform.hpp index 834be433..a7637d69 100644 --- a/src/AvTranscoder/transform/AudioTransform.hpp +++ b/src/AvTranscoder/transform/AudioTransform.hpp @@ -11,7 +11,7 @@ #define ResampleContext SwrContext #endif -class ResampleContext; +struct ResampleContext; namespace avtranscoder { diff --git a/src/AvTranscoder/transform/VideoTransform.hpp b/src/AvTranscoder/transform/VideoTransform.hpp index 1b5b63f6..54a8801e 100644 --- a/src/AvTranscoder/transform/VideoTransform.hpp +++ b/src/AvTranscoder/transform/VideoTransform.hpp @@ -5,7 +5,7 @@ #include -class SwsContext; +struct SwsContext; namespace avtranscoder { From 35f78c87d0fb70c86b8749cb92299a631329f6b3 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Mon, 7 Nov 2016 17:17:13 +0100 Subject: [PATCH 2/2] Option: fix compilation warning in hasChild method --- src/AvTranscoder/Option.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/AvTranscoder/Option.hpp b/src/AvTranscoder/Option.hpp index 7b4efab2..f0d303bc 100644 --- a/src/AvTranscoder/Option.hpp +++ b/src/AvTranscoder/Option.hpp @@ -79,7 +79,7 @@ class AvExport Option void setRatio(const int num, const int den); // array of childs - bool hasChild() const { return _childOptions.size(); } + bool hasChild() const { return ! _childOptions.empty(); } const std::vector