aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/ChangeLog.txt
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-04-17 20:16:10 -0700
committerMcCabe Maxsted2009-04-17 20:16:10 -0700
commit74b923627e51b0998b91579ace30e4f4483a686c (patch)
treed13d3f52eb783ad43a26ff6f09b1b99b7970bd2a /ChangeLog.txt
parentFixed merge conflicts (diff)
parentMerge branch gst-thread into gst-revamp (diff)
downloadmeta-impy-74b923627e51b0998b91579ace30e4f4483a686c.zip
meta-impy-74b923627e51b0998b91579ace30e4f4483a686c.tar.gz
meta-impy-74b923627e51b0998b91579ace30e4f4483a686c.tar.bz2
meta-impy-74b923627e51b0998b91579ace30e4f4483a686c.tar.xz
Fixed merge conflicts
Diffstat (limited to 'ChangeLog.txt')
-rw-r--r--ChangeLog.txt23
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 @@
12009-04-05 Jacek Antonelli <jacek.antonelli@gmail.com>
2
3 * linden/indra/llmedia/llmediaimplgstreamer.cpp:
4 LLMediaImplGStreamer creates new thread for playing.
5 This keeps the viewer responsive while GStreamer does its thing.
6 * linden/indra/llmedia/llmediaimplgstreamer.h:
7 Ditto.
8
9
10 * linden/indra/llmedia/llgstplaythread.cpp:
11 Added LLGstPlayThread class.
12 * linden/indra/llmedia/llgstplaythread.h:
13 Ditto.
14 * linden/indra/llmedia/CMakeLists.txt:
15 Ditto.
16
17
182009-04-04 Jacek Antonelli <jacek.antonelli@gmail.com>
19
20 * linden/indra/llmedia/llmediaimplgstreamer.cpp:
21 Refactored the heart of the GST play code to startPlay().
22
23
12009-04-02 Jacek Antonelli <jacek.antonelli@gmail.com> 242009-04-02 Jacek Antonelli <jacek.antonelli@gmail.com>
2 25
3 * linden/indra/newview/llviewermedia.cpp: 26 * linden/indra/newview/llviewermedia.cpp: