From 76132100ef77ca461e26f8124cf5c4f2d61b0be3 Mon Sep 17 00:00:00 2001
From: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
Date: Thu, 22 Jun 2017 15:55:41 -0400
Subject: [PATCH] remove a couple of minor build warnings
Change-Id: I8ade6ef9e99674d963744021480fdd5e56a6ef80
Reviewed-by: Philippe Gorley <philippe.gorley@savoirfairelinux.com>
---
src/media/audio/audio_rtp_session.cpp | 2 +-
src/media/video/sinkclient.cpp | 2 +-
src/media/video/v4l2/vdpau.cpp | 1 +
src/media/video/video_receive_thread.cpp | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/media/audio/audio_rtp_session.cpp b/src/media/audio/audio_rtp_session.cpp
index f2238758d5..c89b5044b6 100644
--- a/src/media/audio/audio_rtp_session.cpp
+++ b/src/media/audio/audio_rtp_session.cpp
@@ -250,9 +250,9 @@ AudioReceiveThread::AudioReceiveThread(const std::string& id,
: id_(id)
, format_(format)
, stream_(sdp)
- , mtu_(mtu)
, sdpContext_(new MediaIOHandle(sdp.size(), false, &readFunction,
0, 0, this))
+ , mtu_(mtu)
, loop_(std::bind(&AudioReceiveThread::setup, this),
std::bind(&AudioReceiveThread::process, this),
std::bind(&AudioReceiveThread::cleanup, this))
diff --git a/src/media/video/sinkclient.cpp b/src/media/video/sinkclient.cpp
index d8737723cd..fb585afcd6 100644
--- a/src/media/video/sinkclient.cpp
+++ b/src/media/video/sinkclient.cpp
@@ -305,11 +305,11 @@ SinkClient::stop() noexcept
SinkClient::SinkClient(const std::string& id, bool mixer)
: id_ {id}
, mixer_(mixer)
+ , scaler_(new VideoScaler())
#ifdef DEBUG_FPS
, frameCount_(0u)
, lastFrameDebug_(std::chrono::system_clock::now())
#endif
- , scaler_(new VideoScaler())
{}
void
diff --git a/src/media/video/v4l2/vdpau.cpp b/src/media/video/v4l2/vdpau.cpp
index 346bec31bf..dbb5c21fe2 100644
--- a/src/media/video/v4l2/vdpau.cpp
+++ b/src/media/video/v4l2/vdpau.cpp
@@ -55,6 +55,7 @@ VdpauAccel::~VdpauAccel()
int
VdpauAccel::allocateBuffer(AVFrame* frame, int flags)
{
+ (void) flags;
return av_hwframe_get_buffer(framesBufferRef_.get(), frame, 0);
}
diff --git a/src/media/video/video_receive_thread.cpp b/src/media/video/video_receive_thread.cpp
index 5318c0b8fb..f9397beef1 100644
--- a/src/media/video/video_receive_thread.cpp
+++ b/src/media/video/video_receive_thread.cpp
@@ -46,11 +46,11 @@ VideoReceiveThread::VideoReceiveThread(const std::string& id,
, dstHeight_(0)
, id_(id)
, stream_(sdp)
- , mtu_(mtu)
, sdpContext_(stream_.str().size(), false, &readFunction, 0, 0, this)
, sink_ {Manager::instance().createSinkClient(id)}
, restartDecoder_(false)
, isReset_(isReset)
+ , mtu_(mtu)
, requestKeyFrameCallback_(0)
, loop_(std::bind(&VideoReceiveThread::setup, this),
std::bind(&VideoReceiveThread::process, this),
--
GitLab