[Ffmpeg-cvslog] CVS: ffmpeg/libavformat ogg.c,1.23,1.24

[Alexander Strasser beastd]

Update of /cvsroot/ffmpeg/ffmpeg/libavformat
In directory mail:/var2/tmp/cvs-serv19427/libavformat

Modified Files:
	ogg.c 
Log Message:
Make ogg `muxer' expect new vorbis extradata format.
This makes for example encoding vorbis in ogg again.


Index: ogg.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/ogg.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- ogg.c	17 Jul 2005 22:24:36 -0000	1.23
+++ ogg.c	15 Aug 2005 20:42:56 -0000	1.24
@@ -40,15 +40,32 @@
     
     for(n = 0 ; n < avfcontext->nb_streams ; n++) {
         AVCodecContext *codec = avfcontext->streams[n]->codec;
-        uint8_t *p= codec->extradata;
+        uint8_t *headers = codec->extradata;
+        int headers_len = codec->extradata_size;
+        uint8_t *header_start[3];
+        int header_len[3];
+        int i, j, hdr_type;
         
         av_set_pts_info(avfcontext->streams[n], 60, 1, AV_TIME_BASE);
 
-        for(i=0; i < codec->extradata_size; i+= op->bytes){
-            op->bytes = p[i++]<<8;
-            op->bytes+= p[i++];
+        for(j=1,i=0;i<2;++i, ++j) {
+            header_len[i]=0;
+            while(j<headers_len && headers[j]==0xff) {
+                header_len[i]+=0xff;
+                ++j;
+            }
+            header_len[i]+=headers[j];
+        }
+        header_len[2]=headers_len-header_len[0]-header_len[1]-j;
+        headers+=j;
+        header_start[0] = headers;
+        header_start[1] = header_start[0] + header_len[0];
+        header_start[2] = header_start[1] + header_len[1];
 
-            op->packet= &p[i];
+        for(i=0; i < 3; ++i){
+            op->bytes = header_len[i];
+
+            op->packet= header_start[i];
             op->b_o_s= op->packetno==0;
 
             ogg_stream_packetin(&context->os, op);