diff options
| author | Jacek Antonelli | 2008-08-15 23:45:11 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-08-15 23:45:11 -0500 |
| commit | 215f423cbe18fe9ca14a26caef918d303bad28ff (patch) | |
| tree | 0743442b286216cc8e19aa487c26f4e9345ffd64 /linden/indra/llmedia/llmediaimplgstreamervidplug.cpp | |
| parent | Second Life viewer sources 1.18.3.5-RC (diff) | |
| download | meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.zip meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.gz meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.bz2 meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.xz | |
Second Life viewer sources 1.18.4.0-RC
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/llmedia/llmediaimplgstreamervidplug.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/linden/indra/llmedia/llmediaimplgstreamervidplug.cpp b/linden/indra/llmedia/llmediaimplgstreamervidplug.cpp index dade946..1a59654 100644 --- a/linden/indra/llmedia/llmediaimplgstreamervidplug.cpp +++ b/linden/indra/llmedia/llmediaimplgstreamervidplug.cpp | |||
| @@ -2,7 +2,9 @@ | |||
| 2 | * @file llmediaimplgstreamervidplug.h | 2 | * @file llmediaimplgstreamervidplug.h |
| 3 | * @brief Video-consuming static GStreamer plugin for gst-to-LLMediaImpl | 3 | * @brief Video-consuming static GStreamer plugin for gst-to-LLMediaImpl |
| 4 | * | 4 | * |
| 5 | * Copyright (c) 2007-2007, Linden Research, Inc. | 5 | * $LicenseInfo:firstyear=2007&license=viewergpl$ |
| 6 | * | ||
| 7 | * Copyright (c) 2007, Linden Research, Inc. | ||
| 6 | * | 8 | * |
| 7 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
| 8 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
| @@ -24,11 +26,12 @@ | |||
| 24 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO | 26 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO |
| 25 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, | 27 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, |
| 26 | * COMPLETENESS OR PERFORMANCE. | 28 | * COMPLETENESS OR PERFORMANCE. |
| 29 | * $/LicenseInfo$ | ||
| 27 | */ | 30 | */ |
| 28 | 31 | ||
| 29 | #if LL_GSTREAMER_ENABLED | 32 | #if LL_GSTREAMER_ENABLED |
| 30 | 33 | ||
| 31 | #include <string.h> | 34 | #include "linden_common.h" |
| 32 | 35 | ||
| 33 | #include <gst/gst.h> | 36 | #include <gst/gst.h> |
| 34 | #include <gst/video/video.h> | 37 | #include <gst/video/video.h> |