From 322cf0c39e3ea5d881c0fc1e0623b466d725afa5 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 8 Jun 2016 09:54:10 +0100 Subject: [PATCH] Fixed unused parameter warning. --- src/osgPlugins/ffmpeg/FFmpegHeaders.hpp | 2 +- src/osgPlugins/ffmpeg/FFmpegImageStream.cpp | 3 ++- src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp b/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp index 54b08de81..fd9bd2c92 100644 --- a/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp +++ b/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp @@ -23,7 +23,7 @@ extern "C" # include - inline AVAudioResampleContext * swr_alloc_set_opts_proxy(SwrContext *ctx, int64_t out_ch_layout, enum AVSampleFormat out_sample_format, int out_sample_rate, int64_t in_ch_layout, enum AVSampleFormat in_sample_format, int in_sample_rate, int /*log_offset*/, void * /*log_ctx*/) + inline AVAudioResampleContext * swr_alloc_set_opts_proxy(SwrContext* /*ctx*/, int64_t out_ch_layout, enum AVSampleFormat out_sample_format, int out_sample_rate, int64_t in_ch_layout, enum AVSampleFormat in_sample_format, int in_sample_rate, int /*log_offset*/, void * /*log_ctx*/) { AVAudioResampleContext *avr = avresample_alloc_context(); av_opt_set_int(avr, "in_channel_layout", in_ch_layout, 0); diff --git a/src/osgPlugins/ffmpeg/FFmpegImageStream.cpp b/src/osgPlugins/ffmpeg/FFmpegImageStream.cpp index 70b350a6c..e285aa3c7 100644 --- a/src/osgPlugins/ffmpeg/FFmpegImageStream.cpp +++ b/src/osgPlugins/ffmpeg/FFmpegImageStream.cpp @@ -33,7 +33,8 @@ FFmpegImageStream::FFmpegImageStream() : FFmpegImageStream::FFmpegImageStream(const FFmpegImageStream & image, const osg::CopyOp & copyop) : - osg::ImageStream(image, copyop) + osg::ImageStream(image, copyop), + OpenThreads::Thread() { // TODO: probably incorrect or incomplete } diff --git a/src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp b/src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp index 4defbb2f2..2d52bff23 100644 --- a/src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp +++ b/src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp @@ -28,7 +28,7 @@ extern "C" { -static void log_to_osg(void *ptr, int level, const char *fmt, va_list vl) +static void log_to_osg(void* /*ptr*/, int level, const char *fmt, va_list vl) { char logbuf[256]; vsnprintf(logbuf, sizeof(logbuf), fmt, vl);