summaryrefslogtreecommitdiff
path: root/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2009-12-03 09:17:51 -0800
committerNat Goodspeed <nat@lindenlab.com>2009-12-03 09:17:51 -0800
commit5fd2938da8d6709a6596833088fd83c60d591507 (patch)
tree9186f79b996eb60a9bb1f5cefada86c0596ac850 /indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
parent97f97f286ccca1f736c575f516a61c6a32787807 (diff)
parent57b68d9bfe25fc7b9efe41a9fa30935c156acb34 (diff)
Merge with recent viewer-2-0
Diffstat (limited to 'indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp')
-rw-r--r--indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp b/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
index d8ccfaa702..5bb0ef5a99 100644
--- a/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
+++ b/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
@@ -2,6 +2,7 @@
* @file llmediaimplgstreamervidplug.h
* @brief Video-consuming static GStreamer plugin for gst-to-LLMediaImpl
*
+ * @cond
* $LicenseInfo:firstyear=2007&license=viewergpl$
*
* Copyright (c) 2007-2009, Linden Research, Inc.
@@ -28,6 +29,7 @@
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
* COMPLETENESS OR PERFORMANCE.
* $/LicenseInfo$
+ * @endcond
*/
#if LL_GSTREAMER010_ENABLED