[Mplayer-cvslog] CVS: main/libmpcodecs vd_theora.c,1.1,1.2

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var/tmp.root/cvs-serv867

Modified Files:
	vd_theora.c 
Log Message:
just updated vd_theora.c to decode the additional header packets,
introduced by recent changes in Theora CVS which broke the current
support.  I'll be able to upload a newly encoded sample by tuesday.
patch by David Kuehling <dvdkhlng at gmx.de>

note: theora comment decoding disabled for backward compatibility,. result
wasn't used anyway --A'rpi


Index: vd_theora.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_theora.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vd_theora.c	11 May 2003 18:26:48 -0000	1.1
+++ vd_theora.c	6 Jun 2003 19:19:23 -0000	1.2
@@ -41,6 +41,7 @@
     int failed = 1;
     int errorCode = 0;
     ogg_packet op;
+//    theora_comment tc;
 
     /* check whether video output format is supported */
     switch(sh->codec->outfmt[sh->outfmtidx])
@@ -69,6 +70,27 @@
 	  break;
        }
 
+       /* decode comment packet */
+       op.bytes = ds_get_packet (sh->ds,&op.packet);
+       op.b_o_s  = 1;
+#if 0
+       if((errorCode = theora_decode_comment (&tc, &op))) {
+	  mp_msg(MSGT_DECVIDEO,MSGL_ERR, 
+		 "Broken Theora comment; erroroCode=%i!\n", errorCode);
+	  break;
+       }
+#endif
+
+       /* decode tables packet */
+       op.bytes = ds_get_packet (sh->ds,&op.packet);
+       op.b_o_s  = 1;
+       if((errorCode = theora_decode_tables (&context->inf, &op))) {
+	  mp_msg(MSGT_DECVIDEO,MSGL_ERR, 
+		 "Broken Theora comment; erroroCode=%i!\n", errorCode);
+	  break;
+       }
+
+       /* now init codec */
        errorCode = theora_decode_init (&context->st, &context->inf);
        if (errorCode)
        {