diff options
author | Don Kjer <don@lindenlab.com> | 2012-10-11 00:09:04 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2012-10-11 00:09:04 +0000 |
commit | c06c35609c6683731eaea283468f6b32af18fea2 (patch) | |
tree | 69e067fb2d8d602948d618ec7cb71ace149d6e39 /indra/media_plugins/gstreamer010 | |
parent | 19e43e4b588d4aec8f23498993a3a22c0e08a329 (diff) |
Updating linux build to gcc4.6
Diffstat (limited to 'indra/media_plugins/gstreamer010')
-rw-r--r-- | indra/media_plugins/gstreamer010/CMakeLists.txt | 3 | ||||
-rw-r--r-- | indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/indra/media_plugins/gstreamer010/CMakeLists.txt b/indra/media_plugins/gstreamer010/CMakeLists.txt index 519a74aabf..447f6e0689 100644 --- a/indra/media_plugins/gstreamer010/CMakeLists.txt +++ b/indra/media_plugins/gstreamer010/CMakeLists.txt @@ -27,6 +27,9 @@ include_directories( ${GSTREAMER010_INCLUDE_DIRS} ${GSTREAMER010_PLUGINS_BASE_INCLUDE_DIRS} ) +include_directories(SYSTEM + ${LLCOMMON_SYSTEM_INCLUDE_DIRS} + ) ### media_plugin_gstreamer010 diff --git a/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp b/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp index cdb7f4faeb..932aaffa1b 100644 --- a/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp +++ b/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp @@ -278,10 +278,9 @@ gst_slvideo_set_caps (GstBaseSink * bsink, GstCaps * caps) static gboolean gst_slvideo_start (GstBaseSink * bsink) { - GstSLVideo *slvideo; gboolean ret = TRUE; - slvideo = GST_SLVIDEO(bsink); + GST_SLVIDEO(bsink); return ret; } |