← Back to branch summary

~ubuntu-branches/ubuntu/lucid/ffmpeg/lucid-security

« back to all changes in this revision

Viewing changes to libavformat/oggdec.c

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2009-03-13 09:18:28 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20090313091828-n4ktby5eca487uhv
Tags: 3:0.svn20090303-1ubuntu1+unstripped1
merge from ubuntu.jaunty branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavformat/oggdec.c
271
271
                int seg = os->segments[os->segp++];
272
272
                os->pstart += seg;
273
273
                if (seg < 255)
274
 
                  break;
 
274
                    break;
275
275
            }
276
276
        }
277
277
    }else{
278
 
      os->psize = 0;
 
278
        os->psize = 0;
279
279
    }
280
280
 
281
281
    if (os->bufsize - os->bufpos < size){
368
368
    if (os->header < 0){
369
369
        int hdr = os->codec->header (s, idx);
370
370
        if (!hdr){
371
 
          os->header = os->seq;
372
 
          os->segp = segp;
373
 
          os->psize = psize;
374
 
          ogg->headers = 1;
 
371
            os->header = os->seq;
 
372
            os->segp = segp;
 
373
            os->psize = psize;
 
374
            ogg->headers = 1;
375
375
        }else{
376
 
          os->pstart += os->psize;
377
 
          os->psize = 0;
 
376
            os->pstart += os->psize;
 
377
            os->psize = 0;
378
378
        }
379
379
    }
380
380
 
480
480
    ogg->curidx = -1;
481
481
    //linear headers seek from start
482
482
    if (ogg_get_headers (s) < 0){
483
 
      return -1;
 
483
        return -1;
484
484
    }
485
485
 
486
486
    //linear granulepos seek from end