FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed warnings

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14606 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield 2014-12-16 17:15:21 +00:00
parent 4dfe6ab048
commit e4e22bb1af
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/osgPlugins/gstreamer/CMakeLists.txt
View File

@ -3,7 +3,7 @@ INCLUDE_DIRECTORIES(
${GLIB_INCLUDE_DIRS}
)
SET(TARGET_EXTERNAL_LIBRARIES
SET(TARGET_EXTERNAL_LIBRARIES
${GSTREAMER_LIBRARIES}
${GSTREAMER_APP_LIBRARIES}
${GSTREAMER_PBUTILS_LIBRARIES}
@ -11,7 +11,7 @@ SET(TARGET_EXTERNAL_LIBRARIES
${GLIB_GOBJECT_LIBRARIES}
)
SET(TARGET_SRC
SET(TARGET_SRC
GStreamerImageStream.cpp
ReaderWriterGStreamer.cpp
)
@ -20,5 +20,14 @@ SET(TARGET_H
GStreamerImageStream.hpp
)
IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
REMOVE_CXX_FLAG(-pedantic)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-variadic-macros")
ENDIF()
#### end var setup ###
SETUP_PLUGIN(gstreamer)

2
src/osgPlugins/gstreamer/GStreamerImageStream.cpp
View File

@ -76,7 +76,7 @@ bool GStreamerImageStream::open(const std::string& filename)
// build pipeline
gchar *audio_pipe = "";
const gchar *audio_pipe = "";
if( has_audio_stream )
audio_pipe = "deco. ! queue ! audioconvert ! autoaudiosink";