aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llmedia/llmediabase.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:04 -0500
committerJacek Antonelli2008-08-15 23:45:04 -0500
commit117e22047c5752352342d64e3fb7ce00a4eb8113 (patch)
treee32de2cfba0dda8705ae528fcd1fbe23ba075685 /linden/indra/llmedia/llmediabase.cpp
parentSecond Life viewer sources 1.18.0.6 (diff)
downloadmeta-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 'linden/indra/llmedia/llmediabase.cpp')
-rw-r--r--linden/indra/llmedia/llmediabase.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/linden/indra/llmedia/llmediabase.cpp b/linden/indra/llmedia/llmediabase.cpp
index 7abf960..17bb563 100644
--- a/linden/indra/llmedia/llmediabase.cpp
+++ b/linden/indra/llmedia/llmediabase.cpp
@@ -30,6 +30,7 @@
30 30
31#include "llmediabase.h" 31#include "llmediabase.h"
32#include "llmediaimplquicktime.h" 32#include "llmediaimplquicktime.h"
33#include "llmediaimplgstreamer.h"
33 34
34LLMediaBase::LLMediaBase() : 35LLMediaBase::LLMediaBase() :
35 mBufferChangeCount ( 1 ), 36 mBufferChangeCount ( 1 ),
@@ -60,6 +61,13 @@ LLMediaBase* LLMediaBase::make( const MediaType mediaTypeIn, S32 width_pixels, S
60 } 61 }
61 else 62 else
62#endif 63#endif
64#if LL_GSTREAMER_ENABLED
65 if ( mediaTypeIn == QuickTime )
66 {
67 return new LLMediaImplGStreamer ();
68 }
69 else
70#endif
63 71
64 return 0; 72 return 0;
65} 73}