diff options
| -rw-r--r-- | config/external/moz.build | 1 | ||||
| -rw-r--r-- | libs/libogg/AUTHORS (renamed from media/libogg/AUTHORS) | 0 | ||||
| -rw-r--r-- | libs/libogg/CHANGES (renamed from media/libogg/CHANGES) | 0 | ||||
| -rw-r--r-- | libs/libogg/COPYING (renamed from media/libogg/COPYING) | 0 | ||||
| -rw-r--r-- | libs/libogg/README (renamed from media/libogg/README) | 0 | ||||
| -rw-r--r-- | libs/libogg/README_MOZILLA (renamed from media/libogg/README_MOZILLA) | 0 | ||||
| -rw-r--r-- | libs/libogg/include/ogg/config_types.h (renamed from media/libogg/include/ogg/config_types.h) | 0 | ||||
| -rw-r--r-- | libs/libogg/include/ogg/ogg.h (renamed from media/libogg/include/ogg/ogg.h) | 0 | ||||
| -rw-r--r-- | libs/libogg/include/ogg/os_types.h (renamed from media/libogg/include/ogg/os_types.h) | 0 | ||||
| -rw-r--r-- | libs/libogg/memory-reporting.patch (renamed from media/libogg/memory-reporting.patch) | 0 | ||||
| -rw-r--r-- | libs/libogg/moz.build (renamed from media/libogg/moz.build) | 0 | ||||
| -rw-r--r-- | libs/libogg/solaris-types.patch (renamed from media/libogg/solaris-types.patch) | 0 | ||||
| -rw-r--r-- | libs/libogg/src/ogg_alloc.c (renamed from media/libogg/src/ogg_alloc.c) | 0 | ||||
| -rw-r--r-- | libs/libogg/src/ogg_bitwise.c (renamed from media/libogg/src/ogg_bitwise.c) | 0 | ||||
| -rw-r--r-- | libs/libogg/src/ogg_framing.c (renamed from media/libogg/src/ogg_framing.c) | 0 | ||||
| -rw-r--r-- | libs/libogg/update.sh (renamed from media/libogg/update.sh) | 0 | ||||
| -rw-r--r-- | libs/moz.build | 1 | ||||
| -rw-r--r-- | toolkit/content/license.html | 2 |
18 files changed, 2 insertions, 2 deletions
diff --git a/config/external/moz.build b/config/external/moz.build index 5c05899e5..fe48acbce 100644 --- a/config/external/moz.build +++ b/config/external/moz.build @@ -36,7 +36,6 @@ if CONFIG['MOZ_FFVPX']: external_dirs += [ 'media/libcubeb', - 'media/libogg', 'media/libopus', 'media/libtheora', 'media/libspeex_resampler', diff --git a/media/libogg/AUTHORS b/libs/libogg/AUTHORS index a0023f2c1..a0023f2c1 100644 --- a/media/libogg/AUTHORS +++ b/libs/libogg/AUTHORS diff --git a/media/libogg/CHANGES b/libs/libogg/CHANGES index 3f2e0fb26..3f2e0fb26 100644 --- a/media/libogg/CHANGES +++ b/libs/libogg/CHANGES diff --git a/media/libogg/COPYING b/libs/libogg/COPYING index 6111c6c5a..6111c6c5a 100644 --- a/media/libogg/COPYING +++ b/libs/libogg/COPYING diff --git a/media/libogg/README b/libs/libogg/README index 2db22e65f..2db22e65f 100644 --- a/media/libogg/README +++ b/libs/libogg/README diff --git a/media/libogg/README_MOZILLA b/libs/libogg/README_MOZILLA index 6213fdc77..6213fdc77 100644 --- a/media/libogg/README_MOZILLA +++ b/libs/libogg/README_MOZILLA diff --git a/media/libogg/include/ogg/config_types.h b/libs/libogg/include/ogg/config_types.h index 1e7d49098..1e7d49098 100644 --- a/media/libogg/include/ogg/config_types.h +++ b/libs/libogg/include/ogg/config_types.h diff --git a/media/libogg/include/ogg/ogg.h b/libs/libogg/include/ogg/ogg.h index cebe38ee1..cebe38ee1 100644 --- a/media/libogg/include/ogg/ogg.h +++ b/libs/libogg/include/ogg/ogg.h diff --git a/media/libogg/include/ogg/os_types.h b/libs/libogg/include/ogg/os_types.h index 62d717b68..62d717b68 100644 --- a/media/libogg/include/ogg/os_types.h +++ b/libs/libogg/include/ogg/os_types.h diff --git a/media/libogg/memory-reporting.patch b/libs/libogg/memory-reporting.patch index 2a69da4d4..2a69da4d4 100644 --- a/media/libogg/memory-reporting.patch +++ b/libs/libogg/memory-reporting.patch diff --git a/media/libogg/moz.build b/libs/libogg/moz.build index abc8d0285..abc8d0285 100644 --- a/media/libogg/moz.build +++ b/libs/libogg/moz.build diff --git a/media/libogg/solaris-types.patch b/libs/libogg/solaris-types.patch index 845a1ec78..845a1ec78 100644 --- a/media/libogg/solaris-types.patch +++ b/libs/libogg/solaris-types.patch diff --git a/media/libogg/src/ogg_alloc.c b/libs/libogg/src/ogg_alloc.c index 4238d7b61..4238d7b61 100644 --- a/media/libogg/src/ogg_alloc.c +++ b/libs/libogg/src/ogg_alloc.c diff --git a/media/libogg/src/ogg_bitwise.c b/libs/libogg/src/ogg_bitwise.c index 145901d18..145901d18 100644 --- a/media/libogg/src/ogg_bitwise.c +++ b/libs/libogg/src/ogg_bitwise.c diff --git a/media/libogg/src/ogg_framing.c b/libs/libogg/src/ogg_framing.c index 3a2f0a605..3a2f0a605 100644 --- a/media/libogg/src/ogg_framing.c +++ b/libs/libogg/src/ogg_framing.c diff --git a/media/libogg/update.sh b/libs/libogg/update.sh index 5a7184bcb..5a7184bcb 100644 --- a/media/libogg/update.sh +++ b/libs/libogg/update.sh diff --git a/libs/moz.build b/libs/moz.build index e432e1f3a..4b58039e4 100644 --- a/libs/moz.build +++ b/libs/moz.build @@ -28,6 +28,7 @@ if CONFIG['MOZ_UPDATER']: # media DIRS += ['kiss_fft', 'libnestegg', + 'libogg', 'libpng', 'libwebp', ] diff --git a/toolkit/content/license.html b/toolkit/content/license.html index a40596a55..78e013cb8 100644 --- a/toolkit/content/license.html +++ b/toolkit/content/license.html @@ -5457,7 +5457,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. <p>This license applies to files in the following directories with the specified copyright year ranges:</p> <ul> - <li><span class="path">media/libogg/</span>, 2002</li> + <li><span class="path">libs/libogg/</span>, 2002</li> <li><span class="path">media/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> |