77 files changed, 2 insertions, 2 deletions
diff --git a/config/external/moz.build b/config/external/moz.build
index f5c216adb..dab764ef2 100644
--- a/config/external/moz.build
+++ b/config/external/moz.build
@@ -36,7 +36,6 @@ if CONFIG['MOZ_FFVPX']:
 
 external_dirs += [
     'media/libcubeb',
-    'media/libtheora',
     'media/libspeex_resampler',
     'media/libstagefright',
     'media/libsoundtouch',
diff --git a/media/libtheora/AUTHORS b/libs/libtheora/AUTHORS
index 077d4e588..077d4e588 100644
--- a/media/libtheora/AUTHORS
+++ b/libs/libtheora/AUTHORS
diff --git a/media/libtheora/CHANGES b/libs/libtheora/CHANGES
index fb09793a3..fb09793a3 100644
--- a/media/libtheora/CHANGES
+++ b/libs/libtheora/CHANGES
diff --git a/media/libtheora/COPYING b/libs/libtheora/COPYING
index c8ccce4ff..c8ccce4ff 100644
--- a/media/libtheora/COPYING
+++ b/libs/libtheora/COPYING
diff --git a/media/libtheora/LICENSE b/libs/libtheora/LICENSE
index 5e5ec0846..5e5ec0846 100644
--- a/media/libtheora/LICENSE
+++ b/libs/libtheora/LICENSE
diff --git a/media/libtheora/Makefile.in b/libs/libtheora/Makefile.in
index d3d611e56..d3d611e56 100644
--- a/media/libtheora/Makefile.in
+++ b/libs/libtheora/Makefile.in
diff --git a/media/libtheora/README b/libs/libtheora/README
index 7663f9ff8..7663f9ff8 100644
--- a/media/libtheora/README
+++ b/libs/libtheora/README
diff --git a/media/libtheora/README_MOZILLA b/libs/libtheora/README_MOZILLA
index d48dbfa6f..d48dbfa6f 100644
--- a/media/libtheora/README_MOZILLA
+++ b/libs/libtheora/README_MOZILLA
diff --git a/media/libtheora/bug468275-r18219.patch b/libs/libtheora/bug468275-r18219.patch
index 7b64b4195..7b64b4195 100644
--- a/media/libtheora/bug468275-r18219.patch
+++ b/libs/libtheora/bug468275-r18219.patch
diff --git a/media/libtheora/bug625773-r17780.patch b/libs/libtheora/bug625773-r17780.patch
index af112560b..af112560b 100644
--- a/media/libtheora/bug625773-r17780.patch
+++ b/libs/libtheora/bug625773-r17780.patch
diff --git a/media/libtheora/bug703135.patch b/libs/libtheora/bug703135.patch
index 99ba2b5ce..99ba2b5ce 100644
--- a/media/libtheora/bug703135.patch
+++ b/libs/libtheora/bug703135.patch
diff --git a/media/libtheora/bug752139-r18031.patch b/libs/libtheora/bug752139-r18031.patch
index 62ea87632..62ea87632 100644
--- a/media/libtheora/bug752139-r18031.patch
+++ b/libs/libtheora/bug752139-r18031.patch
diff --git a/media/libtheora/bug752668-r18268.patch b/libs/libtheora/bug752668-r18268.patch
index 6931e07fa..6931e07fa 100644
--- a/media/libtheora/bug752668-r18268.patch
+++ b/libs/libtheora/bug752668-r18268.patch
diff --git a/media/libtheora/bug920992.patch b/libs/libtheora/bug920992.patch
index eada85a49..eada85a49 100644
--- a/media/libtheora/bug920992.patch
+++ b/libs/libtheora/bug920992.patch
diff --git a/media/libtheora/include/theora/codec.h b/libs/libtheora/include/theora/codec.h
index 5c2669630..5c2669630 100644
--- a/media/libtheora/include/theora/codec.h
+++ b/libs/libtheora/include/theora/codec.h
diff --git a/media/libtheora/include/theora/theora.h b/libs/libtheora/include/theora/theora.h
index 575a889b7..575a889b7 100644
--- a/media/libtheora/include/theora/theora.h
+++ b/libs/libtheora/include/theora/theora.h
diff --git a/media/libtheora/include/theora/theoradec.h b/libs/libtheora/include/theora/theoradec.h
index 6177af321..6177af321 100644
--- a/media/libtheora/include/theora/theoradec.h
+++ b/libs/libtheora/include/theora/theoradec.h
diff --git a/media/libtheora/include/theora/theoraenc.h b/libs/libtheora/include/theora/theoraenc.h
index 721ea89b9..721ea89b9 100644
--- a/media/libtheora/include/theora/theoraenc.h
+++ b/libs/libtheora/include/theora/theoraenc.h
diff --git a/media/libtheora/lib/apiwrapper.c b/libs/libtheora/lib/apiwrapper.c
index dc959b8d1..dc959b8d1 100644
--- a/media/libtheora/lib/apiwrapper.c
+++ b/libs/libtheora/lib/apiwrapper.c
diff --git a/media/libtheora/lib/apiwrapper.h b/libs/libtheora/lib/apiwrapper.h
index ff45e0a4d..ff45e0a4d 100644
--- a/media/libtheora/lib/apiwrapper.h
+++ b/libs/libtheora/lib/apiwrapper.h
diff --git a/media/libtheora/lib/arm/arm2gnu.pl b/libs/libtheora/lib/arm/arm2gnu.pl
index 5831bd81e..5831bd81e 100644
--- a/media/libtheora/lib/arm/arm2gnu.pl
+++ b/libs/libtheora/lib/arm/arm2gnu.pl
diff --git a/media/libtheora/lib/arm/armbits.h b/libs/libtheora/lib/arm/armbits.h
index 1540d7eb5..1540d7eb5 100644
--- a/media/libtheora/lib/arm/armbits.h
+++ b/libs/libtheora/lib/arm/armbits.h
diff --git a/media/libtheora/lib/arm/armbits.s b/libs/libtheora/lib/arm/armbits.s
index 0fdb6fdd3..0fdb6fdd3 100644
--- a/media/libtheora/lib/arm/armbits.s
+++ b/libs/libtheora/lib/arm/armbits.s
diff --git a/media/libtheora/lib/arm/armcpu.c b/libs/libtheora/lib/arm/armcpu.c
index 8b0f9a857..8b0f9a857 100644
--- a/media/libtheora/lib/arm/armcpu.c
+++ b/libs/libtheora/lib/arm/armcpu.c
diff --git a/media/libtheora/lib/arm/armcpu.h b/libs/libtheora/lib/arm/armcpu.h
index 18dd95821..18dd95821 100644
--- a/media/libtheora/lib/arm/armcpu.h
+++ b/libs/libtheora/lib/arm/armcpu.h
diff --git a/media/libtheora/lib/arm/armfrag.s b/libs/libtheora/lib/arm/armfrag.s
index e20579eee..e20579eee 100644
--- a/media/libtheora/lib/arm/armfrag.s
+++ b/libs/libtheora/lib/arm/armfrag.s
diff --git a/media/libtheora/lib/arm/armidct.s b/libs/libtheora/lib/arm/armidct.s
index babd846ec..babd846ec 100644
--- a/media/libtheora/lib/arm/armidct.s
+++ b/libs/libtheora/lib/arm/armidct.s
diff --git a/media/libtheora/lib/arm/armint.h b/libs/libtheora/lib/arm/armint.h
index cc62d2438..cc62d2438 100644
--- a/media/libtheora/lib/arm/armint.h
+++ b/libs/libtheora/lib/arm/armint.h
diff --git a/media/libtheora/lib/arm/armloop.s b/libs/libtheora/lib/arm/armloop.s
index 0a1d4705e..0a1d4705e 100644
--- a/media/libtheora/lib/arm/armloop.s
+++ b/libs/libtheora/lib/arm/armloop.s
diff --git a/media/libtheora/lib/arm/armopts.s b/libs/libtheora/lib/arm/armopts.s
index e4da429e4..e4da429e4 100644
--- a/media/libtheora/lib/arm/armopts.s
+++ b/libs/libtheora/lib/arm/armopts.s
diff --git a/media/libtheora/lib/arm/armstate.c b/libs/libtheora/lib/arm/armstate.c
index a56060838..a56060838 100644
--- a/media/libtheora/lib/arm/armstate.c
+++ b/libs/libtheora/lib/arm/armstate.c
diff --git a/media/libtheora/lib/bitpack.c b/libs/libtheora/lib/bitpack.c
index 8bfce4c3d..8bfce4c3d 100644
--- a/media/libtheora/lib/bitpack.c
+++ b/libs/libtheora/lib/bitpack.c
diff --git a/media/libtheora/lib/bitpack.h b/libs/libtheora/lib/bitpack.h
index 237b58405..237b58405 100644
--- a/media/libtheora/lib/bitpack.h
+++ b/libs/libtheora/lib/bitpack.h
diff --git a/media/libtheora/lib/config.h b/libs/libtheora/lib/config.h
index 49772ac7f..49772ac7f 100644
--- a/media/libtheora/lib/config.h
+++ b/libs/libtheora/lib/config.h
diff --git a/media/libtheora/lib/dct.h b/libs/libtheora/lib/dct.h
index 24ba6f111..24ba6f111 100644
--- a/media/libtheora/lib/dct.h
+++ b/libs/libtheora/lib/dct.h
diff --git a/media/libtheora/lib/decapiwrapper.c b/libs/libtheora/lib/decapiwrapper.c
index 12ea475d1..12ea475d1 100644
--- a/media/libtheora/lib/decapiwrapper.c
+++ b/libs/libtheora/lib/decapiwrapper.c
diff --git a/media/libtheora/lib/decinfo.c b/libs/libtheora/lib/decinfo.c
index 603b1f93e..603b1f93e 100644
--- a/media/libtheora/lib/decinfo.c
+++ b/libs/libtheora/lib/decinfo.c
diff --git a/media/libtheora/lib/decint.h b/libs/libtheora/lib/decint.h
index bd6522273..bd6522273 100644
--- a/media/libtheora/lib/decint.h
+++ b/libs/libtheora/lib/decint.h
diff --git a/media/libtheora/lib/decode.c b/libs/libtheora/lib/decode.c
index 563782b7a..563782b7a 100644
--- a/media/libtheora/lib/decode.c
+++ b/libs/libtheora/lib/decode.c
diff --git a/media/libtheora/lib/dequant.c b/libs/libtheora/lib/dequant.c
index e554872d4..e554872d4 100644
--- a/media/libtheora/lib/dequant.c
+++ b/libs/libtheora/lib/dequant.c
diff --git a/media/libtheora/lib/dequant.h b/libs/libtheora/lib/dequant.h
index ef25838e3..ef25838e3 100644
--- a/media/libtheora/lib/dequant.h
+++ b/libs/libtheora/lib/dequant.h
diff --git a/media/libtheora/lib/fragment.c b/libs/libtheora/lib/fragment.c
index 4ba6af1b7..4ba6af1b7 100644
--- a/media/libtheora/lib/fragment.c
+++ b/libs/libtheora/lib/fragment.c
diff --git a/media/libtheora/lib/huffdec.c b/libs/libtheora/lib/huffdec.c
index fe013c611..fe013c611 100644
--- a/media/libtheora/lib/huffdec.c
+++ b/libs/libtheora/lib/huffdec.c
diff --git a/media/libtheora/lib/huffdec.h b/libs/libtheora/lib/huffdec.h
index 2fd112a90..2fd112a90 100644
--- a/media/libtheora/lib/huffdec.h
+++ b/libs/libtheora/lib/huffdec.h
diff --git a/media/libtheora/lib/huffman.h b/libs/libtheora/lib/huffman.h
index 36cf7572e..36cf7572e 100644
--- a/media/libtheora/lib/huffman.h
+++ b/libs/libtheora/lib/huffman.h
diff --git a/media/libtheora/lib/idct.c b/libs/libtheora/lib/idct.c
index c56eb94c5..c56eb94c5 100644
--- a/media/libtheora/lib/idct.c
+++ b/libs/libtheora/lib/idct.c
diff --git a/media/libtheora/lib/info.c b/libs/libtheora/lib/info.c
index 6b9762978..6b9762978 100644
--- a/media/libtheora/lib/info.c
+++ b/libs/libtheora/lib/info.c
diff --git a/media/libtheora/lib/internal.c b/libs/libtheora/lib/internal.c
index 1b2611da1..1b2611da1 100644
--- a/media/libtheora/lib/internal.c
+++ b/libs/libtheora/lib/internal.c
diff --git a/media/libtheora/lib/internal.h b/libs/libtheora/lib/internal.h
index 24e1b5125..24e1b5125 100644
--- a/media/libtheora/lib/internal.h
+++ b/libs/libtheora/lib/internal.h
diff --git a/media/libtheora/lib/mathops.h b/libs/libtheora/lib/mathops.h
index a1a4f9df0..a1a4f9df0 100644
--- a/media/libtheora/lib/mathops.h
+++ b/libs/libtheora/lib/mathops.h
diff --git a/media/libtheora/lib/ocintrin.h b/libs/libtheora/lib/ocintrin.h
index d49ebb215..d49ebb215 100644
--- a/media/libtheora/lib/ocintrin.h
+++ b/libs/libtheora/lib/ocintrin.h
diff --git a/media/libtheora/lib/quant.c b/libs/libtheora/lib/quant.c
index c3f3f4771..c3f3f4771 100644
--- a/media/libtheora/lib/quant.c
+++ b/libs/libtheora/lib/quant.c
diff --git a/media/libtheora/lib/quant.h b/libs/libtheora/lib/quant.h
index 49ce13a65..49ce13a65 100644
--- a/media/libtheora/lib/quant.h
+++ b/libs/libtheora/lib/quant.h
diff --git a/media/libtheora/lib/state.c b/libs/libtheora/lib/state.c
index 5e7b0ae65..5e7b0ae65 100644
--- a/media/libtheora/lib/state.c
+++ b/libs/libtheora/lib/state.c
diff --git a/media/libtheora/lib/state.h b/libs/libtheora/lib/state.h
index f176a53ce..f176a53ce 100644
--- a/media/libtheora/lib/state.h
+++ b/libs/libtheora/lib/state.h
diff --git a/media/libtheora/lib/x86/mmxfrag.c b/libs/libtheora/lib/x86/mmxfrag.c
index b7df1c1ec..b7df1c1ec 100644
--- a/media/libtheora/lib/x86/mmxfrag.c
+++ b/libs/libtheora/lib/x86/mmxfrag.c
diff --git a/media/libtheora/lib/x86/mmxidct.c b/libs/libtheora/lib/x86/mmxidct.c
index 8d61bdfb1..8d61bdfb1 100644
--- a/media/libtheora/lib/x86/mmxidct.c
+++ b/libs/libtheora/lib/x86/mmxidct.c
diff --git a/media/libtheora/lib/x86/mmxloop.h b/libs/libtheora/lib/x86/mmxloop.h
index 1f6090b56..1f6090b56 100644
--- a/media/libtheora/lib/x86/mmxloop.h
+++ b/libs/libtheora/lib/x86/mmxloop.h
diff --git a/media/libtheora/lib/x86/mmxstate.c b/libs/libtheora/lib/x86/mmxstate.c
index 0b9586f94..0b9586f94 100644
--- a/media/libtheora/lib/x86/mmxstate.c
+++ b/libs/libtheora/lib/x86/mmxstate.c
diff --git a/media/libtheora/lib/x86/sse2idct.c b/libs/libtheora/lib/x86/sse2idct.c
index 5f8523fa5..5f8523fa5 100644
--- a/media/libtheora/lib/x86/sse2idct.c
+++ b/libs/libtheora/lib/x86/sse2idct.c
diff --git a/media/libtheora/lib/x86/sse2trans.h b/libs/libtheora/lib/x86/sse2trans.h
index e76da5140..e76da5140 100644
--- a/media/libtheora/lib/x86/sse2trans.h
+++ b/libs/libtheora/lib/x86/sse2trans.h
diff --git a/media/libtheora/lib/x86/x86cpu.c b/libs/libtheora/lib/x86/x86cpu.c
index c3a20b319..c3a20b319 100644
--- a/media/libtheora/lib/x86/x86cpu.c
+++ b/libs/libtheora/lib/x86/x86cpu.c
diff --git a/media/libtheora/lib/x86/x86cpu.h b/libs/libtheora/lib/x86/x86cpu.h
index 153a48d89..153a48d89 100644
--- a/media/libtheora/lib/x86/x86cpu.h
+++ b/libs/libtheora/lib/x86/x86cpu.h
diff --git a/media/libtheora/lib/x86/x86int.h b/libs/libtheora/lib/x86/x86int.h
index 35bfb0a02..35bfb0a02 100644
--- a/media/libtheora/lib/x86/x86int.h
+++ b/libs/libtheora/lib/x86/x86int.h
diff --git a/media/libtheora/lib/x86/x86state.c b/libs/libtheora/lib/x86/x86state.c
index a3d37267f..a3d37267f 100644
--- a/media/libtheora/lib/x86/x86state.c
+++ b/libs/libtheora/lib/x86/x86state.c
diff --git a/media/libtheora/lib/x86_vc/mmxfrag.c b/libs/libtheora/lib/x86_vc/mmxfrag.c
index c16b026ff..c16b026ff 100644
--- a/media/libtheora/lib/x86_vc/mmxfrag.c
+++ b/libs/libtheora/lib/x86_vc/mmxfrag.c
diff --git a/media/libtheora/lib/x86_vc/mmxidct.c b/libs/libtheora/lib/x86_vc/mmxidct.c
index 53a9ac7f3..53a9ac7f3 100644
--- a/media/libtheora/lib/x86_vc/mmxidct.c
+++ b/libs/libtheora/lib/x86_vc/mmxidct.c
diff --git a/media/libtheora/lib/x86_vc/mmxloop.h b/libs/libtheora/lib/x86_vc/mmxloop.h
index 2561fca2a..2561fca2a 100644
--- a/media/libtheora/lib/x86_vc/mmxloop.h
+++ b/libs/libtheora/lib/x86_vc/mmxloop.h
diff --git a/media/libtheora/lib/x86_vc/mmxstate.c b/libs/libtheora/lib/x86_vc/mmxstate.c
index d3d468d5f..d3d468d5f 100644
--- a/media/libtheora/lib/x86_vc/mmxstate.c
+++ b/libs/libtheora/lib/x86_vc/mmxstate.c
diff --git a/media/libtheora/lib/x86_vc/x86cpu.c b/libs/libtheora/lib/x86_vc/x86cpu.c
index 41f4bcba9..41f4bcba9 100644
--- a/media/libtheora/lib/x86_vc/x86cpu.c
+++ b/libs/libtheora/lib/x86_vc/x86cpu.c
diff --git a/media/libtheora/lib/x86_vc/x86cpu.h b/libs/libtheora/lib/x86_vc/x86cpu.h
index 327d93246..327d93246 100644
--- a/media/libtheora/lib/x86_vc/x86cpu.h
+++ b/libs/libtheora/lib/x86_vc/x86cpu.h
diff --git a/media/libtheora/lib/x86_vc/x86int.h b/libs/libtheora/lib/x86_vc/x86int.h
index bc4c54a2f..bc4c54a2f 100644
--- a/media/libtheora/lib/x86_vc/x86int.h
+++ b/libs/libtheora/lib/x86_vc/x86int.h
diff --git a/media/libtheora/lib/x86_vc/x86state.c b/libs/libtheora/lib/x86_vc/x86state.c
index 7aa73deae..7aa73deae 100644
--- a/media/libtheora/lib/x86_vc/x86state.c
+++ b/libs/libtheora/lib/x86_vc/x86state.c
diff --git a/media/libtheora/moz.build b/libs/libtheora/moz.build
index 0a88d8f92..0a88d8f92 100644
--- a/media/libtheora/moz.build
+++ b/libs/libtheora/moz.build
diff --git a/media/libtheora/update.sh b/libs/libtheora/update.sh
index e1a95425a..e1a95425a 100644
--- a/media/libtheora/update.sh
+++ b/libs/libtheora/update.sh
diff --git a/libs/moz.build b/libs/moz.build
index 63bbf5cbf..88e81726c 100644
--- a/libs/moz.build
+++ b/libs/moz.build
@@ -31,6 +31,7 @@ DIRS += ['kiss_fft',
          'libogg',
          'libopus',
          'libpng',
+         'libtheora',
          'libwebp',
 ]
 
diff --git a/toolkit/content/license.html b/toolkit/content/license.html
index 78e013cb8..8b56e3afa 100644
--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -5458,7 +5458,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
       with the specified copyright year ranges:</p>
     <ul>
       <li><span class="path">libs/libogg/</span>, 2002</li>
-      <li><span class="path">media/libtheora/</span>, 2002-2007</li>
+      <li><span class="path">libs/libtheora/</span>, 2002-2007</li>
       <li><span class="path">media/libvorbis/</span>, 2002-2004</li>
       <li><span class="path">media/libtremor/</span>, 2002-2010</li>
       <li><span class="path">media/libspeex_resampler/</span>, 2002-2008</li>