win32/config.h - Issue 28553003: Updating Opus to a pre-release of 1.1

Side by Side Diff: win32/config.h

Issue 28553003: Updating Opus to a pre-release of 1.1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/opus

Patch Set: Removing failing file Created 7 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « win32/VS2010/test_opus_encode.vcxproj.filters ('k') | no next file » | no next file with comments »

OLD	NEW
1 /***********************************************************************	1 /***********************************************************************

2 Copyright (c) 2011, Skype Limited. All rights reserved.	2 Copyright (c) 2011, Skype Limited. All rights reserved.

3 Redistribution and use in source and binary forms, with or without	3 Redistribution and use in source and binary forms, with or without

4 modification, are permitted provided that the following conditions	4 modification, are permitted provided that the following conditions

5 are met:	5 are met:

6 - Redistributions of source code must retain the above copyright notice,	6 - Redistributions of source code must retain the above copyright notice,

7 this list of conditions and the following disclaimer.	7 this list of conditions and the following disclaimer.

8 - Redistributions in binary form must reproduce the above copyright	8 - Redistributions in binary form must reproduce the above copyright

9 notice, this list of conditions and the following disclaimer in the	9 notice, this list of conditions and the following disclaimer in the

10 documentation and/or other materials provided with the distribution.	10 documentation and/or other materials provided with the distribution.

11 - Neither the name of Internet Society, IETF or IETF Trust, nor the	11 - Neither the name of Internet Society, IETF or IETF Trust, nor the

12 names of specific contributors, may be used to endorse or promote	12 names of specific contributors, may be used to endorse or promote

13 products derived from this software without specific prior written	13 products derived from this software without specific prior written

14 permission.	14 permission.

15 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS”	15 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

16 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE	16 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

17 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE	17 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

18 ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE	18 ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE

19 LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR	19 LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

20 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF	20 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

21 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS	21 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

22 INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN	22 INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

23 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)	23 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

24 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE	24 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

25 POSSIBILITY OF SUCH DAMAGE.	25 POSSIBILITY OF SUCH DAMAGE.

26 ***********************************************************************/	26 ***********************************************************************/

27	27

28 #ifndef CONFIG_H	28 #ifndef CONFIG_H

29 #define CONFIG_H	29 #define CONFIG_H

30	30

31 #define CELT_BUILD 1

32

33 #define inline __inline	31 #define inline __inline

34	32

35 #define USE_ALLOCA 1	33 #define USE_ALLOCA 1

36	34

37 /* Comment out the next line for floating-point code */	35 /* Comment out the next line for floating-point code */

38 /#define FIXED_POINT 1 /	36 /#define FIXED_POINT 1 /

39	37

40 #define OPUS_BUILD 1	38 #define OPUS_BUILD 1

41	39

42 /* Get rid of the CELT VS compile warnings */	40 /* Enable SSE functions, if compiled with SSE/SSE2 (note that AMD64 implies SSE2 ) */

43 #if 1	41 #if defined(_M_X64) \|\| (defined(_M_IX86_FP) && (_M_IX86_FP >= 1))

44 #pragma warning(disable : 4996)/* This function or variable may be unsafe. Consi der using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details. */	42 #define __SSE__ 1

45 #endif	43 #endif

46	44

47 #include "version.h"	45 #include "version.h"

48	46

49 #endif CONFIG_H	47 #endif /* CONFIG_H */

OLD	NEW