diff --git a/media/libopus/Makefile.in b/media/libopus/Makefile.in
deleted file mode 100644
--- a/media/libopus/Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-include $(topsrcdir)/config/rules.mk
-
-ifdef GNU_AS
-ifeq ($(CPU_ARCH),arm)
-
-celt_pitch_xcorr_arm-gnu.s: celt/arm/armopts-gnu.S
-
-# armopts needs a specific rule, because arm2gnu.pl will always add the .S
-# suffix when translating the files that include it.
-celt/arm/armopts-gnu.S: $(srcdir)/celt/arm/armopts.s $(call mkdir_deps,celt/arm) $(GLOBAL_DEPS)
-	$(PERL) $(srcdir)/celt/arm/arm2gnu.pl < $< > $@
-# For all others, we can use an implicit rule
-%-gnu.s: $(srcdir)/celt/arm/%.s $(GLOBAL_DEPS)
-	$(PERL) $(srcdir)/celt/arm/arm2gnu.pl < $< > $@
-
-endif
-endif
diff --git a/media/libopus/celt/float_cast.h b/media/libopus/celt/float_cast.h
--- a/media/libopus/celt/float_cast.h
+++ b/media/libopus/celt/float_cast.h
@@ -97,11 +97,11 @@
                 } ;
 
                 return intgr ;
         }
 
-#elif defined(HAVE_LRINTF)
+#elif defined(HAVE_LRINTF) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 
 /*      These defines enable functionality introduced with the 1999 ISO C
 **      standard. They must be defined before the inclusion of math.h to
 **      engage them. If optimisation is enabled, these functions will be
 **      inlined. With optimisation switched off, you have to link in the
@@ -115,11 +115,11 @@
 #define __USE_ISOC99 1
 
 #include <math.h>
 #define float2int(x) lrintf(x)
 
-#elif (defined(HAVE_LRINT))
+#elif defined(HAVE_LRINT) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 
 #define _ISOC9X_SOURCE 1
 #define _ISOC99_SOURCE 1
 
 #define __USE_ISOC9X 1
diff --git a/media/libopus/moz.yaml b/media/libopus/moz.yaml
--- a/media/libopus/moz.yaml
+++ b/media/libopus/moz.yaml
@@ -18,15 +18,15 @@
   # Usually different from repository url
   url: https://opus-codec.org/
 
   # Human-readable identifier for this version/release
   # Generally "version NNN", "tag SSS", "bookmark SSS"
-  release: 2654707e86cc94413998976d179b2ab4a2aa3114 (2022-04-01T14:32:38.000-04:00).
+  release: ccaaffa9a3ee427e9401c4dcf6462e378d9a4694 (2022-04-02T15:21:48.000-04:00).
 
   # Revision to pull in
   # Must be a long or short commit SHA (long preferred)
-  revision: 2654707e86cc94413998976d179b2ab4a2aa3114
+  revision: ccaaffa9a3ee427e9401c4dcf6462e378d9a4694
 
   # The package's license, where possible using the mnemonic from
   # https://spdx.org/licenses/
   # Multiple licenses can be specified (as a YAML list)
   # A "LICENSE" file must exist containing the full license text