aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/media_plugins/gstreamer010 (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'jacek/exp' into expDavid Seikel2011-04-031-0/+10
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore linden/indra/newview/English.lproj/InfoPlist.strings linden/indra/newview/llpanellogin.cpp linden/indra/newview/res/viewerRes.rc linden/indra/newview/skins/default/xui/en-us/panel_login.xml linden/install.xml Mostly went with my originals, manually merged llpaterrogin.cpp and panel_login.xml.
| * Added log info for when GStreamer fails to load because the plugin wasn't ↵McCabe Maxsted2011-03-191-0/+10
| | | | | | | | compiled correctly
* | Merge remote-tracking branch 'mccabe/exp' into weeklyDavid Seikel2011-03-201-55/+55
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: (Keeping these around as a record, there was some strangeness. .gitignore linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp linden/indra/newview/llfloaterregioninfo.cpp linden/indra/newview/llfloatertos.cpp linden/indra/newview/llpanellogin.cpp linden/indra/newview/skins/default/html/en-us/loading-error/index.html linden/indra/newview/skins/default/html/en-us/loading/loading.html linden/indra/newview/skins/default/xui/en-us/floater_about.xml linden/install.xml
| * Merge remote-tracking branch 'jacek/weekly' into weeklyMcCabe Maxsted2011-03-091-2/+2
| |\ | | | | | | | | | | | | Conflicts: linden/indra/newview/viewer_manifest.py
| | * Fixed Linux compile warnings in media_plugin_gstreamer010.cpp.Jacek Antonelli2011-03-041-2/+2
| | | | | | | | | | | | | | | | | | | | | Warning was because writeToLog expected a char pointer, but was being given string constants. Exact warning message was: deprecated conversion from string constant to ‘char*’
| * | fix gstreamer plugin doesn't compile on linuxArmin Weatherwax2011-03-011-53/+53
| |/
* | Merge branch 'weekly' into brandingDavid Seikel2011-02-203-69/+104
|\ \ | |/ | | | | | | | | | | Conflicts (solved): linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp linden/indra/newview/llappviewer.cpp linden/indra/newview/llappviewerwin32.cpp
| * Removed a bit of spam from the GStreamer log fileMcCabe Maxsted2011-02-181-0/+1
| |
| * Created a media_plugin_gstreamer010.log file in the cwd for the GStreamer pluginMcCabe Maxsted2011-02-181-68/+96
| |
| * Fixed gstreamer plugin headers missing from cmakeMcCabe Maxsted2011-02-101-0/+6
| |
| * Make media_plugin_gstreamer010 find all its headers correctly on Windows ↵McCabe Maxsted2011-02-101-1/+1
| | | | | | | | (notes: need to add archives for iconv and gstreamer to install.xml, doesn't link yet)
* | Change imprudence -> meta-impy, though not the URLs. Probably some will ↵David Seikel2011-02-091-2/+2
|/ | | | | | need to be reverted later. Changed file names to.
* GStreamer010 plugin needs Carbon.h on Mac.Jacek Antonelli2010-11-131-0/+4
|
* IMP-692: SNOW-713: Global objects in libllcommon duplicated in pluginsAleric Inglewood2010-11-073-30/+10
| | | | | | | | | | See http://jira.secondlife.com/browse/SNOW-713 This patch makes llcommon shared. It contains the following snowglobe (SVN) changesets: 3478, 3479, 3480, 3481, 3482, 3485, 3496, 3498, 3500, 3519 and 3531, plus the fix for all rejects. Note that changes to scripts/automated_build_scripts/opensrc-build.sh (changesets 3500 and 3625) were ignored as we don't have scripts/automated_build_scripts.
* Set LL_GSTREAMER010_ENABLED to true for Linux-only until gstreamer loading ↵McCabe Maxsted2010-10-262-4/+4
| | | | can be sorted on windows
* Let the gstreamer plugin build on windowsRobin Cornelius2010-10-102-4/+22
|
* linux* kill imprudence gstreamer, use system gstreamer instead.Armin Weatherwax2010-09-231-1219/+0
| | | | | who ever builds a release with that needs to consider to install some really old gstreamer at /usr/local/lib - lenny has 0.10.19
* Imprudence style gstreamer plugin (remove llgst, syms and such)Armin Weatherwax2010-09-238-528/+410
|
* Robin Cornelius: fixes for building plugins on Linux 64bitArmin Weatherwax2010-09-231-0/+4
|
* update to latest SG2 media_pluginsArmin Weatherwax2010-09-238-59/+69
|
* port SG2.0 Mediaplugs (webkit supports flash now)Armin Weatherwax2010-09-2310-10/+24
|
* First LL update of plugins, mainly documentationArmin Weatherwax2010-09-234-52/+69
|
* llmediaplugins first stepArmin Weatherwax2010-09-2311-0/+3548