diff options
author | Samuel Kolb <skolb@lindenlab.com> | 2009-11-30 18:06:23 -0800 |
---|---|---|
committer | Samuel Kolb <skolb@lindenlab.com> | 2009-11-30 18:06:23 -0800 |
commit | 4b710367a1ac986e8be731bc391c0b375424148f (patch) | |
tree | 4310984bc5838a989ef0b48c773b7e0347f4a357 /indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp | |
parent | e2699c64a20262f6fbe6c1432294e8428e8cda5d (diff) | |
parent | 6dd3f54924b57224298f6d76c766b403d165783f (diff) |
local merge
Diffstat (limited to 'indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp')
-rw-r--r-- | indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp | 2 |
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 |