Merge branch gst-thread into gst-revamp

Conflicts:
	linden/indra/llmedia/llmediaimplgstreamer.cpp

1 files changed, 23 insertions, 0 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index a4c3415..f99ebae 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,26 @@
+2009-04-05  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp:
+        LLMediaImplGStreamer creates new thread for playing.
+        This keeps the viewer responsive while GStreamer does its thing.
+        * linden/indra/llmedia/llmediaimplgstreamer.h:
+        Ditto.
+
+
+        * linden/indra/llmedia/llgstplaythread.cpp: 
+        Added LLGstPlayThread class.
+        * linden/indra/llmedia/llgstplaythread.h: 
+        Ditto.
+        * linden/indra/llmedia/CMakeLists.txt: 
+        Ditto.
+
+
+2009-04-04  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp:
+        Refactored the heart of the GST play code to startPlay().
+
+
 2009-04-02  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
         * linden/indra/newview/llviewermedia.cpp: