The Tor Browser / file comparison
comparison: media/libtheora/bug703135.patch
media/libtheora/bug703135.patch
- branch
- TOR_BUG_9701
- changeset 15
- b8a032363ba2
equal
deleted
inserted
replaced
| -1:000000000000 | 0:dc461d212b9a |
|---|---|
| 1 diff --git a/media/libtheora/lib/huffdec.c b/media/libtheora/lib/huffdec.c | |
| 2 --- a/media/libtheora/lib/huffdec.c | |
| 3 +++ b/media/libtheora/lib/huffdec.c | |
| 4 @@ -320,16 +320,19 @@ static size_t oc_huff_node_size(int _nbi | |
| 5 /*Produces a collapsed-tree representation of the given token list. | |
| 6 _tree: The storage for the collapsed Huffman tree. | |
| 7 This may be NULL to compute the required storage size instead of | |
| 8 constructing the tree. | |
| 9 _tokens: A list of internal tokens, in the order they are found in the | |
| 10 codebook, and the lengths of their corresponding codewords. | |
| 11 _ntokens: The number of tokens corresponding to this tree node. | |
| 12 Return: The number of words required to store the tree.*/ | |
| 13 +#if defined(_MSC_VER) && _MSC_VER >= 1700 | |
| 14 +#pragma optimize( "", off ) | |
| 15 +#endif | |
| 16 static size_t oc_huff_tree_collapse(ogg_int16_t *_tree, | |
| 17 unsigned char _tokens[][2],int _ntokens){ | |
| 18 ogg_int16_t node[34]; | |
| 19 unsigned char depth[34]; | |
| 20 unsigned char last[34]; | |
| 21 size_t ntree; | |
| 22 int ti; | |
| 23 int l; | |
| 24 @@ -367,16 +370,19 @@ static size_t oc_huff_tree_collapse(ogg_ | |
| 25 /*Pop back up a level of recursion.*/ | |
| 26 else if(l-->0)nbits=depth[l+1]-depth[l]; | |
| 27 } | |
| 28 while(l>=0); | |
| 29 } | |
| 30 while(l>=0); | |
| 31 return ntree; | |
| 32 } | |
| 33 +#if defined(_MSC_VER) && _MSC_VER >= 1700 | |
| 34 +#pragma optimize( "", on ) | |
| 35 +#endif | |
| 36 | |
| 37 /*Unpacks a set of Huffman trees, and reduces them to a collapsed | |
| 38 representation. | |
| 39 _opb: The buffer to unpack the trees from. | |
| 40 _nodes: The table to fill with the Huffman trees. | |
| 41 Return: 0 on success, or a negative value on error. | |
| 42 The caller is responsible for cleaning up any partially initialized | |
| 43 _nodes on failure.*/ |
