diff options
author | Jacek Antonelli | 2008-08-15 23:45:04 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:04 -0500 |
commit | 117e22047c5752352342d64e3fb7ce00a4eb8113 (patch) | |
tree | e32de2cfba0dda8705ae528fcd1fbe23ba075685 /linden/indra/llmedia/llmediamoviebase.cpp | |
parent | Second Life viewer sources 1.18.0.6 (diff) | |
download | meta-impy-117e22047c5752352342d64e3fb7ce00a4eb8113.zip meta-impy-117e22047c5752352342d64e3fb7ce00a4eb8113.tar.gz meta-impy-117e22047c5752352342d64e3fb7ce00a4eb8113.tar.bz2 meta-impy-117e22047c5752352342d64e3fb7ce00a4eb8113.tar.xz |
Second Life viewer sources 1.18.1.2
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llmedia/llmediamoviebase.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/linden/indra/llmedia/llmediamoviebase.cpp b/linden/indra/llmedia/llmediamoviebase.cpp index 46b76b0..de9933b 100644 --- a/linden/indra/llmedia/llmediamoviebase.cpp +++ b/linden/indra/llmedia/llmediamoviebase.cpp | |||
@@ -30,6 +30,7 @@ | |||
30 | 30 | ||
31 | #include "llmediamoviebase.h" | 31 | #include "llmediamoviebase.h" |
32 | #include "llmediaimplquicktime.h" | 32 | #include "llmediaimplquicktime.h" |
33 | #include "llmediaimplgstreamer.h" | ||
33 | 34 | ||
34 | LLMediaMovieBase::LLMediaMovieBase() | 35 | LLMediaMovieBase::LLMediaMovieBase() |
35 | { | 36 | { |
@@ -47,6 +48,13 @@ LLMediaMovieBase* LLMediaMovieBase::make( const MediaType mediaTypeIn, S32 width | |||
47 | } | 48 | } |
48 | else | 49 | else |
49 | #endif | 50 | #endif |
51 | #if LL_GSTREAMER_ENABLED | ||
52 | if ( mediaTypeIn == QuickTime ) | ||
53 | { | ||
54 | return new LLMediaImplGStreamer (); | ||
55 | } | ||
56 | else | ||
57 | #endif | ||
50 | 58 | ||
51 | return 0; | 59 | return 0; |
52 | } | 60 | } |