diff options
author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-08-18 13:13:41 +0000 |
---|---|---|
committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-08-18 13:13:41 +0000 |
commit | b2b796f466cbba3d5c588c99719bbb1d4df25f56 (patch) | |
tree | feb691144970370be3bc784a298efacabb560fe5 /configure | |
parent | 2f140634550d0a68b762d9d0f50e715b4ac00d59 (diff) | |
download | mpv-b2b796f466cbba3d5c588c99719bbb1d4df25f56.tar.bz2 mpv-b2b796f466cbba3d5c588c99719bbb1d4df25f56.tar.xz |
Theora-CVS update patch by Martin Drab <drab@kepler.fjfi.cvut.cz>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10659 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 40 |
1 files changed, 37 insertions, 3 deletions
@@ -4162,14 +4162,48 @@ else _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 |