[Mplayer-cvslog] CVS: main configure,1.752,1.753

[Alex Beregszaszi]

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

Modified Files:
	configure 
Log Message:
Theora-CVS update patch by Martin Drab <drab at kepler.fjfi.cvut.cz>

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.752
retrieving revision 1.753
diff -u -r1.752 -r1.753
--- configure	17 Aug 2003 20:56:10 -0000	1.752
+++ configure	18 Aug 2003 13:12:44 -0000	1.753
@@ -4162,14 +4162,48 @@
   _def_tremor='#undef TREMOR'
   _nocodecmodules="libvorbis $_nocodecmodules"
 fi
-echores "$_vorbis"
+if test "$_vorbis" = yes -a "$_tremor" = yes ; then
+  echores "$_vorbis (Tremor)"
+else
+  echores "$_vorbis"
+fi
 
-echocheck "OggTheora support"
+echocheck "OggTheora support (only the CVS version!)"
 if test "$_theora" = auto ; then
   _theora=no
   cat > $TMPC << EOF
 #include <theora/theora.h>
-int main(void) { theora_version_number (); return 0; }
+#include <string.h>
+int main(void) 
+{ 
+  /* theora is in flux, make sure that all interface routines and 
+   * datatypes exist and work the way we expect it, so we don't break
+   * mplayer */
+  ogg_packet op;
+  theora_comment tc;
+  theora_info inf;
+  theora_state st;
+  yuv_buffer yuv;
+  int r;
+  double t;
+
+  theora_info_init (&inf);
+  theora_comment_init (&tc);
+ 
+  return 0;
+
+  /* we don't want to execute this kind of nonsense; just for making sure
+   * that compilation works... */
+  memset(&op, 0, sizeof(op));
+  r = theora_decode_header (&inf, &tc, &op);
+  r = theora_decode_init (&st, &inf);
+  t = theora_granule_time (&st, op.granulepos);
+  r = theora_decode_packetin (&st, &op);
+  r = theora_decode_YUVout (&st, &yuv);
+  theora_clear (&st);
+
+  return 0;
+}
 EOF
   cc_check -ltheora -logg -lm && _theora=yes
 fi