diff options
author | McCabe Maxsted | 2009-03-29 22:21:34 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-03-29 22:21:34 -0700 |
commit | 433abcb5274d62e5c5ef8c8a411db37d55b732f6 (patch) | |
tree | b00461fd0ce532e34bb34d5ddc1ac93b03416ca8 /ChangeLog.txt | |
parent | Fixed video streams freezing the viewer (diff) | |
parent | Fixed some minor mistakes in set_gst_plugin_path(). (diff) | |
download | meta-impy-433abcb5274d62e5c5ef8c8a411db37d55b732f6.zip meta-impy-433abcb5274d62e5c5ef8c8a411db37d55b732f6.tar.gz meta-impy-433abcb5274d62e5c5ef8c8a411db37d55b732f6.tar.bz2 meta-impy-433abcb5274d62e5c5ef8c8a411db37d55b732f6.tar.xz |
Fixed merge conflicts
Diffstat (limited to 'ChangeLog.txt')
-rw-r--r-- | ChangeLog.txt | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 0a3a9be..bd95bce 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -1,3 +1,28 @@ | |||
1 | 2009-03-28 Jacek Antonelli <jacek.antonelli@gmail.com> | ||
2 | |||
3 | * linden/indra/llmedia/llmediaimplgstreamer.cpp: | ||
4 | Improved set_gst_plugin_path, more comprehensive path. | ||
5 | Also tried to tidy up a bit. | ||
6 | |||
7 | |||
8 | * linden/indra/llmedia/llmediaimplgstreamer.cpp: | ||
9 | Moved Windows GST_PLUGIN_PATH setup to LLMediaImplGStreamer. | ||
10 | LLAppViewer::gst_plugin_path --> | ||
11 | LLMediaImplGStreamer::set_gst_plugin_path | ||
12 | |||
13 | |||
14 | * linden/indra/llmedia/llmediaimplgstreamer.cpp: | ||
15 | Ditto. | ||
16 | * linden/indra/newview/llappviewer.h: | ||
17 | Ditto. | ||
18 | * linden/indra/newview/llappviewer.cpp: | ||
19 | Ditto. | ||
20 | |||
21 | |||
22 | * linden/indra/llmedia/llmediaimplgstreamer.cpp: | ||
23 | Print out the plugins gstreamer finds, for debugging. | ||
24 | |||
25 | |||
1 | 2009-03-27 McCabe Maxsted <hakushakukun@gmail.com> | 26 | 2009-03-27 McCabe Maxsted <hakushakukun@gmail.com> |
2 | 27 | ||
3 | * linden/indra/llmedia/llmediaimplgstreamer.cpp: | 28 | * linden/indra/llmedia/llmediaimplgstreamer.cpp: |