ffmpeg roll of source to mar 9 version...

patched-ffmpeg-mt/libavformat/oggdec.c

 /*
  * Ogg bitstream support
  * Luca Barbato <lu_zero@gentoo.org>
  * Based on tcvp implementation
  *
  */
 
 /**
     Copyright (C) 2005  Michael Ahlberg, Måns Rullgård
 
@@ skipping 114 matching lines @@
     for (i = 0; i < ogg->nstreams; i++){
         struct ogg_stream *os = ogg->streams + i;
         os->bufpos = 0;
         os->pstart = 0;
         os->psize = 0;
         os->granule = -1;
         os->lastpts = AV_NOPTS_VALUE;
         os->lastdts = AV_NOPTS_VALUE;
         os->nsegs = 0;
         os->segp = 0;
+        os->incomplete = 0;
     }
 
     ogg->curidx = -1;
 
     return 0;
 }
 
 static const struct ogg_codec *
 ogg_find_codec (uint8_t * buf, int size)
 {
@@ skipping 127 matching lines @@
     if (get_buffer (bc, os->segments, nsegs) < nsegs)
         return -1;
 
     os->nsegs = nsegs;
     os->segp = 0;
 
     size = 0;
     for (i = 0; i < nsegs; i++)
         size += os->segments[i];
 
-    if (flags & OGG_FLAG_CONT){
+    if (flags & OGG_FLAG_CONT || os->incomplete){
         if (!os->psize){
             while (os->segp < os->nsegs){
                 int seg = os->segments[os->segp++];
                 os->pstart += seg;
                 if (seg < 255)
                     break;
             }
         }
     }else{
         os->psize = 0;
@@ skipping 74 matching lines @@
             int ss = os->segments[os->segp++];
             os->psize += ss;
             if (ss < 255){
                 complete = 1;
                 break;
             }
         }
 
         if (!complete && os->segp == os->nsegs){
             ogg->curidx = -1;
+            os->incomplete = 1;
         }
     }while (!complete);
 
 #if 0
     av_log (s, AV_LOG_DEBUG,
             "ogg_packet: idx %i, frame size %i, start %i\n",
             idx, os->psize, os->pstart);
 #endif
 
     ogg->curidx = idx;
+    os->incomplete = 0;
 
-    if (os->header < 0){
+    if (!ogg->headers){
         int hdr = os->codec->header (s, idx);
+        os->header = os->seq;
         if (!hdr){
-            os->header = os->seq;
             os->segp = segp;
             os->psize = psize;
             ogg->headers = 1;
         }else{
             os->pstart += os->psize;
             os->psize = 0;
         }
     }
 
     if (os->header > -1 && os->seq > os->header){
@@ skipping 235 matching lines @@
     sizeof (struct ogg),
     ogg_probe,
     ogg_read_header,
     ogg_read_packet,
     ogg_read_close,
     NULL,
     ogg_read_timestamp,
     .extensions = "ogg",
     .metadata_conv = ff_vorbiscomment_metadata_conv,
 };