Updating Opus to release 1.1

celt/arm/armopts.s.in

Index: celt/arm/armopts.s.in
diff --git a/celt/arm/armcpu.h b/celt/arm/armopts.s.in
similarity index 75%
copy from celt/arm/armcpu.h
copy to celt/arm/armopts.s.in
index 68d80fe222560a7d01a0ebd317e752f0ed0ab8fa..3d8aaf27541a3143c86df858ae8387092d91f4d3 100644
--- a/celt/arm/armcpu.h
+++ b/celt/arm/armopts.s.in
@@ -1,5 +1,4 @@
-/* Copyright (c) 2010 Xiph.Org Foundation
- * Copyright (c) 2013 Parrot */
+/* Copyright (C) 2013 Mozilla Corporation */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
@@ -25,11 +24,14 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-/* Original code from libtheora modified to suit to Opus */
+; Set the following to 1 if we have EDSP instructions
+;  (LDRD/STRD, etc., ARMv5E and later).
+OPUS_ARM_MAY_HAVE_EDSP  * @OPUS_ARM_MAY_HAVE_EDSP@
 
-#ifndef ARMCPU_H
-#define ARMCPU_H
+; Set the following to 1 if we have ARMv6 media instructions.
+OPUS_ARM_MAY_HAVE_MEDIA * @OPUS_ARM_MAY_HAVE_MEDIA@
 
-int opus_select_arch(void);
+; Set the following to 1 if we have NEON (some ARMv7)
+OPUS_ARM_MAY_HAVE_NEON  * @OPUS_ARM_MAY_HAVE_NEON@
 
-#endif
+END