diff options
author | Matt A. Tobin <mattatobin@localhost.localdomain> | 2018-02-02 04:16:08 -0500 |
---|---|---|
committer | Matt A. Tobin <mattatobin@localhost.localdomain> | 2018-02-02 04:16:08 -0500 |
commit | 5f8de423f190bbb79a62f804151bc24824fa32d8 (patch) | |
tree | 10027f336435511475e392454359edea8e25895d /media/libtheora/bug703135.patch | |
parent | 49ee0794b5d912db1f95dce6eb52d781dc210db5 (diff) | |
download | uxp-5f8de423f190bbb79a62f804151bc24824fa32d8.tar.gz |
Add m-esr52 at 52.6.0
Diffstat (limited to 'media/libtheora/bug703135.patch')
-rw-r--r-- | media/libtheora/bug703135.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/media/libtheora/bug703135.patch b/media/libtheora/bug703135.patch new file mode 100644 index 0000000000..99ba2b5ce7 --- /dev/null +++ b/media/libtheora/bug703135.patch @@ -0,0 +1,43 @@ +diff --git a/media/libtheora/lib/huffdec.c b/media/libtheora/lib/huffdec.c +--- a/media/libtheora/lib/huffdec.c ++++ b/media/libtheora/lib/huffdec.c +@@ -320,16 +320,19 @@ static size_t oc_huff_node_size(int _nbi + /*Produces a collapsed-tree representation of the given token list. + _tree: The storage for the collapsed Huffman tree. + This may be NULL to compute the required storage size instead of + constructing the tree. + _tokens: A list of internal tokens, in the order they are found in the + codebook, and the lengths of their corresponding codewords. + _ntokens: The number of tokens corresponding to this tree node. + Return: The number of words required to store the tree.*/ ++#if defined(_MSC_VER) && _MSC_VER >= 1700 ++#pragma optimize( "", off ) ++#endif + static size_t oc_huff_tree_collapse(ogg_int16_t *_tree, + unsigned char _tokens[][2],int _ntokens){ + ogg_int16_t node[34]; + unsigned char depth[34]; + unsigned char last[34]; + size_t ntree; + int ti; + int l; +@@ -367,16 +370,19 @@ static size_t oc_huff_tree_collapse(ogg_ + /*Pop back up a level of recursion.*/ + else if(l-->0)nbits=depth[l+1]-depth[l]; + } + while(l>=0); + } + while(l>=0); + return ntree; + } ++#if defined(_MSC_VER) && _MSC_VER >= 1700 ++#pragma optimize( "", on ) ++#endif + + /*Unpacks a set of Huffman trees, and reduces them to a collapsed + representation. + _opb: The buffer to unpack the trees from. + _nodes: The table to fill with the Huffman trees. + Return: 0 on success, or a negative value on error. + The caller is responsible for cleaning up any partially initialized + _nodes on failure.*/ |