~ubuntu-branches/ubuntu/raring/libav/raring-security

« back to all changes in this revision

Viewing changes to libavcodec/indeo2.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2011-09-28 09:18:34 UTC
  • mfrom: (1.3.7 sid)
  • Revision ID: package-import@ubuntu.com-20110928091834-w415mnuh06h4zpvc
Tags: 4:0.7.1-7ubuntu2
Revert "Convert package to include multiarch support."

Show diffs side-by-side

added added

removed removed

Lines of Context:
156
156
        return -1;
157
157
    }
158
158
 
 
159
    start = 48; /* hardcoded for now */
 
160
 
 
161
    if (start >= buf_size) {
 
162
        av_log(s->avctx, AV_LOG_ERROR, "input buffer size too small (%d)\n", buf_size);
 
163
        return AVERROR_INVALIDDATA;
 
164
    }
 
165
 
159
166
    s->decode_delta = buf[18];
160
167
 
161
168
    /* decide whether frame uses deltas or not */
163
170
    for (i = 0; i < buf_size; i++)
164
171
        buf[i] = av_reverse[buf[i]];
165
172
#endif
166
 
    start = 48; /* hardcoded for now */
167
173
 
168
 
    init_get_bits(&s->gb, buf + start, buf_size - start);
 
174
    init_get_bits(&s->gb, buf + start, (buf_size - start) * 8);
169
175
 
170
176
    if (s->decode_delta) { /* intraframe */
171
177
        ir2_decode_plane(s, avctx->width, avctx->height,