Author: mru Date: Mon Jul 31 22:56:15 2006 New Revision: 5873 Removed: trunk/libavcodec/oggtheora.c Modified: trunk/configure trunk/libavcodec/Makefile trunk/libavcodec/allcodecs.c trunk/libavcodec/avcodec.h Log: remove libtheora wrapper Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Mon Jul 31 22:56:15 2006 @@ -411,7 +411,6 @@ mp3lame="no" libogg="no" vorbis="no" -theora="no" faad="no" faadbin="no" faac="no" @@ -909,14 +908,6 @@ exit 1; fi -if test "$theora" = "yes" ; then - if test "$libogg" = "no"; then - echo "libogg must be enabled to enable Theora." - fail="yes" - theora="no" - fi -fi - if test "$vorbis" = "yes" ; then if test "$libogg" = "no"; then echo "libogg must be enabled to enable Vorbis." @@ -1256,7 +1247,6 @@ enabled mp3lame && require LAME lame/lame.h lame_init -lmp3lame enabled vorbis && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbis -lvorbisenc -logg enabled libogg && require libogg ogg/ogg.h ogg_sync_init -logg -enabled theora && require libtheora theora/theora.h theora_info_init -ltheora enabled xvid && require XviD xvid.h xvid_global -lxvidcore enabled x264 && require x264 x264.h x264_encoder_open -lx264 enabled dc1394 && require libdc1394 libdc1394/dc1394_control.h dc1394_create_handle -ldc1394_control -lraw1394 @@ -1881,11 +1871,6 @@ echo "CONFIG_LIBVORBIS=yes" >> config.mak fi -if test "$theora" = "yes" ; then - echo "#define CONFIG_LIBTHEORA 1" >> $TMPH - echo "CONFIG_LIBTHEORA=yes" >> config.mak -fi - if test "$faad" = "yes" ; then echo "#define CONFIG_FAAD 1" >> $TMPH echo "CONFIG_FAAD=yes" >> config.mak Modified: trunk/libavcodec/Makefile ============================================================================== --- trunk/libavcodec/Makefile (original) +++ trunk/libavcodec/Makefile Mon Jul 31 22:56:15 2006 @@ -210,7 +210,6 @@ OBJS-$(CONFIG_X264) += x264.o OBJS-$(CONFIG_MP3LAME) += mp3lameaudio.o OBJS-$(CONFIG_LIBVORBIS) += oggvorbis.o -OBJS-$(CONFIG_LIBTHEORA) += oggtheora.o OBJS-$(CONFIG_LIBGSM) += libgsm.o # currently using liba52 for ac3 decoding Modified: trunk/libavcodec/allcodecs.c ============================================================================== --- trunk/libavcodec/allcodecs.c (original) +++ trunk/libavcodec/allcodecs.c Mon Jul 31 22:56:15 2006 @@ -59,11 +59,6 @@ register_avcodec(&oggvorbis_decoder); #endif //CONFIG_OGGVORBIS_DECODER #endif -#ifdef CONFIG_LIBTHEORA -#ifdef CONFIG_OGGTHEORA_DECODER - register_avcodec(&oggtheora_decoder); -#endif //CONFIG_OGGTHEORA_DECODER -#endif #ifdef CONFIG_FAAC #ifdef CONFIG_FAAC_ENCODER register_avcodec(&faac_encoder); @@ -375,7 +370,7 @@ #ifdef CONFIG_VP3_DECODER register_avcodec(&vp3_decoder); #endif //CONFIG_VP3_DECODER -#if (defined CONFIG_THEORA_DECODER && !defined CONFIG_LIBTHEORA) +#ifdef CONFIG_THEORA_DECODER register_avcodec(&theora_decoder); #endif //CONFIG_THEORA_DECODER #ifdef CONFIG_ASV1_DECODER Modified: trunk/libavcodec/avcodec.h ============================================================================== --- trunk/libavcodec/avcodec.h (original) +++ trunk/libavcodec/avcodec.h Mon Jul 31 22:56:15 2006 @@ -201,8 +201,6 @@ CODEC_ID_TTA, CODEC_ID_SMACKAUDIO, - CODEC_ID_OGGTHEORA= 0x16000, - /* subtitle codecs */ CODEC_ID_DVD_SUBTITLE= 0x17000, CODEC_ID_DVB_SUBTITLE, @@ -2186,7 +2184,6 @@ extern AVCodec huffyuv_decoder; extern AVCodec ffvhuff_decoder; extern AVCodec oggvorbis_decoder; -extern AVCodec oggtheora_decoder; extern AVCodec cyuv_decoder; extern AVCodec h264_decoder; extern AVCodec indeo3_decoder;