Bug 529197 - Update libtheora to SVN r16712. r=chris.double
authorMatthew Gregan <kinetik@flim.org>
Wed, 18 Nov 2009 12:03:32 +1300
changeset 34956 75fe32a53fa62922028ce55634bccd68cf2baed9
parent 34955 60ad411785a324aa092de1339938986dcbfbba17
child 34957 8085f61b8a7a3d3d2d57ee313e5ae4f338a79f0b
child 34958 882b724fcc373facecb96d8f7a28c1cc0d99f7f4
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschris
bugs529197
milestone1.9.3a1pre
Bug 529197 - Update libtheora to SVN r16712. r=chris.double
media/libtheora/CHANGES
media/libtheora/README
media/libtheora/README_MOZILLA
media/libtheora/include/theora/config.h
media/libtheora/lib/config.h
media/libtheora/lib/huffdec.c
--- a/media/libtheora/CHANGES
+++ b/media/libtheora/CHANGES
@@ -1,11 +1,19 @@
-libtheora 1.1.1 (unreleased snapshot)
+libtheora 1.1.2 (unreleased snapshot)
+
+ - no changes recorded
+
+libtheora 1.1.1 (2009 October 1)
 
- - No changes have been recorded
+ - Fix problems with MSVC inline assembly
+ - Add the missing encoder_disabled.c to the distribution
+ - build updates: autogen.sh should work better after switching systems
+   and the MSVC project now defaults to the dynamic runtime library
+ - Namespace some variables to avoid conflicts on wince.
 
 libtheora 1.1.0 (2009 September 24)
 
  - Fix various small issues with the example and telemetry code
  - Fix handing a zero-byte packet as the first frame
  - Documentation cleanup
  - Two minor build fixes
 
--- a/media/libtheora/README
+++ b/media/libtheora/README
@@ -1,20 +1,20 @@
 -------------------------------------------------------------------------
-             The Xiph.org Foundation's libtheora 1.1 beta release
+             The Xiph.org Foundation's libtheora 1.1 
 -------------------------------------------------------------------------
 
 *** What is Theora?
 
 Theora is Xiph.Org's first publicly released video codec, intended
 for use within the Foundation's Ogg multimedia streaming system.
 Theora is derived directly from On2's VP3 codec, adds new features
 while allow it a longer useful lifetime as an competitive codec.
 
-The 1.0 release decoder supports all the new features, but the
+The 1.0 release decoder supported all the new features, but the
 encoder is nearly identical to the VP3 code.
 
 The 1.1 release features a completely rewritten encoder, offering
 better performance and compression, and making more complete use
 of the format's feature set. Files produced by both encoders can
 be decoded by either release.
 
 *** Where is Theora?
--- a/media/libtheora/README_MOZILLA
+++ b/media/libtheora/README_MOZILLA
@@ -1,5 +1,5 @@
 The source from this directory was copied from the theora subversion trunk
 using the update.sh script. The changes made were those applied by update.sh,
 the addition/update of Makefile.in files for the Mozilla build system.
 
-The subversion revision used was r16584.
+The subversion revision used was r16712.
--- a/media/libtheora/include/theora/config.h
+++ b/media/libtheora/include/theora/config.h
@@ -61,30 +61,30 @@
 
 /* Define to the address where bug reports for this package should be sent. */
 #define PACKAGE_BUGREPORT ""
 
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "libtheora"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libtheora 1.1.0"
+#define PACKAGE_STRING "libtheora 1.1.1+svn"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "libtheora"
 
 /* Define to the home page for this package. */
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.1.0"
+#define PACKAGE_VERSION "1.1.1+svn"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Define to exclude encode support from the build */
 /* #undef THEORA_DISABLE_ENCODE */
 
 /* Define to exclude floating point code from the build */
 /* #undef THEORA_DISABLE_FLOAT */
 
 /* Version number of package */
-#define VERSION "1.1.0"
+#define VERSION "1.1.1+svn"
--- a/media/libtheora/lib/config.h
+++ b/media/libtheora/lib/config.h
@@ -61,30 +61,30 @@
 
 /* Define to the address where bug reports for this package should be sent. */
 #define PACKAGE_BUGREPORT ""
 
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "libtheora"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libtheora 1.1.0"
+#define PACKAGE_STRING "libtheora 1.1.1+svn"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "libtheora"
 
 /* Define to the home page for this package. */
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.1.0"
+#define PACKAGE_VERSION "1.1.1+svn"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Define to exclude encode support from the build */
 /* #undef THEORA_DISABLE_ENCODE */
 
 /* Define to exclude floating point code from the build */
 /* #undef THEORA_DISABLE_FLOAT */
 
 /* Version number of package */
-#define VERSION "1.1.0"
+#define VERSION "1.1.1+svn"
--- a/media/libtheora/lib/huffdec.c
+++ b/media/libtheora/lib/huffdec.c
@@ -6,17 +6,17 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE Theora SOURCE CODE IS COPYRIGHT (C) 2002-2009                *
  * by the Xiph.Org Foundation and contributors http://www.xiph.org/ *
  *                                                                  *
  ********************************************************************
 
   function:
-    last mod: $Id: huffdec.c 16503 2009-08-22 18:14:02Z giles $
+    last mod: $Id: huffdec.c 16702 2009-11-15 00:40:55Z tterribe $
 
  ********************************************************************/
 
 #include <stdlib.h>
 #include <string.h>
 #include <ogg/ogg.h>
 #include "huffdec.h"
 #include "decint.h"
@@ -408,17 +408,17 @@ static oc_huff_node *oc_huff_tree_collap
   depth=mindepth=oc_huff_tree_mindepth(_binode);
   occupancy=1<<mindepth;
   do{
     loccupancy=occupancy;
     occupancy=oc_huff_tree_occupancy(_binode,++depth);
   }
   while(occupancy>loccupancy&&occupancy>=1<<OC_MAXI(depth-OC_HUFF_SLUSH,0));
   depth--;
-  if(depth<=1)return oc_huff_tree_copy(_binode,_storage);
+  if(depth<=0)return oc_huff_tree_copy(_binode,_storage);
   size=oc_huff_node_size(depth);
   root=oc_huff_node_init(_storage,size,depth);
   root->depth=_binode->depth;
   oc_huff_node_fill(root->nodes,_binode,depth,depth,_storage);
   return root;
 }
 
 /*Unpacks a set of Huffman trees, and reduces them to a collapsed