michael@0: diff --git a/media/libtheora/lib/huffdec.c b/media/libtheora/lib/huffdec.c michael@0: --- a/media/libtheora/lib/huffdec.c michael@0: +++ b/media/libtheora/lib/huffdec.c michael@0: @@ -320,16 +320,19 @@ static size_t oc_huff_node_size(int _nbi michael@0: /*Produces a collapsed-tree representation of the given token list. michael@0: _tree: The storage for the collapsed Huffman tree. michael@0: This may be NULL to compute the required storage size instead of michael@0: constructing the tree. michael@0: _tokens: A list of internal tokens, in the order they are found in the michael@0: codebook, and the lengths of their corresponding codewords. michael@0: _ntokens: The number of tokens corresponding to this tree node. michael@0: Return: The number of words required to store the tree.*/ michael@0: +#if defined(_MSC_VER) && _MSC_VER >= 1700 michael@0: +#pragma optimize( "", off ) michael@0: +#endif michael@0: static size_t oc_huff_tree_collapse(ogg_int16_t *_tree, michael@0: unsigned char _tokens[][2],int _ntokens){ michael@0: ogg_int16_t node[34]; michael@0: unsigned char depth[34]; michael@0: unsigned char last[34]; michael@0: size_t ntree; michael@0: int ti; michael@0: int l; michael@0: @@ -367,16 +370,19 @@ static size_t oc_huff_tree_collapse(ogg_ michael@0: /*Pop back up a level of recursion.*/ michael@0: else if(l-->0)nbits=depth[l+1]-depth[l]; michael@0: } michael@0: while(l>=0); michael@0: } michael@0: while(l>=0); michael@0: return ntree; michael@0: } michael@0: +#if defined(_MSC_VER) && _MSC_VER >= 1700 michael@0: +#pragma optimize( "", on ) michael@0: +#endif michael@0: michael@0: /*Unpacks a set of Huffman trees, and reduces them to a collapsed michael@0: representation. michael@0: _opb: The buffer to unpack the trees from. michael@0: _nodes: The table to fill with the Huffman trees. michael@0: Return: 0 on success, or a negative value on error. michael@0: The caller is responsible for cleaning up any partially initialized michael@0: _nodes on failure.*/