diff options
Diffstat (limited to 'linden/indra/llmedia/llmediaengine.h')
-rw-r--r-- | linden/indra/llmedia/llmediaengine.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/linden/indra/llmedia/llmediaengine.h b/linden/indra/llmedia/llmediaengine.h index bd1ce6a..264060a 100644 --- a/linden/indra/llmedia/llmediaengine.h +++ b/linden/indra/llmedia/llmediaengine.h | |||
@@ -12,12 +12,12 @@ | |||
12 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
13 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 13 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
15 | * online at http://secondlife.com/developers/opensource/gplv2 | 15 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
16 | * | 16 | * |
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlife.com/developers/opensource/flossexception | 20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
21 | * | 21 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 22 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 23 | * that you have read and understood your obligations described above, |
@@ -42,8 +42,9 @@ | |||
42 | 42 | ||
43 | #include "message.h" | 43 | #include "message.h" |
44 | 44 | ||
45 | // current version on my Windows system after a 7.3.1 update is 120684544 (dec) and 7318000 (hex) | 45 | // older: after a 7.3.1 update version is 120684544 (dec) and 7318000 (hex) |
46 | #define LL_MIN_QUICKTIME_VERSION ( 120684544 ) | 46 | // current version on my Windows system after a 7.4 update version is 121667584 (dec) and 7408000 (hex) |
47 | #define LL_MIN_QUICKTIME_VERSION ( 121667584 ) // QT 7.4 | ||
47 | 48 | ||
48 | ////////////////////////////////////////////////////////////////////////////// | 49 | ////////////////////////////////////////////////////////////////////////////// |
49 | // media engine singleton | 50 | // media engine singleton |