← Back to branch summary

~ubuntu-branches/ubuntu/utopic/ffmpeg-debian/utopic

« back to all changes in this revision

Viewing changes to libavcodec/idcinvideo.c

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2009-01-20 09:20:53 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20090120092053-izz63p40hc98qfgp
Tags: 3:0.svn20090119-1ubuntu1
https://launchpad.net/bugs/318501
https://launchpad.net/bugs/253767
* merge from debian. LP: #318501
* new version fixes CVE-2008-3230, LP: #253767

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/idcinvideo.c
60
60
  int count;
61
61
  unsigned char used;
62
62
  int children[2];
63
 
} hnode_t;
 
63
} hnode;
64
64
 
65
65
typedef struct IdcinContext {
66
66
 
70
70
    const unsigned char *buf;
71
71
    int size;
72
72
 
73
 
    hnode_t huff_nodes[256][HUF_TOKENS*2];
 
73
    hnode huff_nodes[256][HUF_TOKENS*2];
74
74
    int num_huff_nodes[256];
75
75
 
76
76
} IdcinContext;
81
81
 * Returns the node index of the lowest unused node, or -1 if all nodes
82
82
 * are used.
83
83
 */
84
 
static int huff_smallest_node(hnode_t *hnodes, int num_hnodes) {
 
84
static int huff_smallest_node(hnode *hnodes, int num_hnodes) {
85
85
    int i;
86
86
    int best, best_node;
87
87
 
114
114
 *    That is: huff_nodes[prev][num_huff_nodes[prev]] is the root node.
115
115
 */
116
116
static av_cold void huff_build_tree(IdcinContext *s, int prev) {
117
 
    hnode_t *node, *hnodes;
 
117
    hnode *node, *hnodes;
118
118
     int num_hnodes, i;
119
119
 
120
120
    num_hnodes = HUF_TOKENS;
173
173
 
174
174
static void idcin_decode_vlcs(IdcinContext *s)
175
175
{
176
 
    hnode_t *hnodes;
 
176
    hnode *hnodes;
177
177
    long x, y;
178
178
    int prev;
179
179
    unsigned char v = 0;