endif
endif
-ifeq ($(CONFIG_VORBIS),yes)
-EXTRALIBS+=-lvorbis -lvorbisenc -logg
+ifeq ($(CONFIG_LIBOGG),yes)
+EXTRALIBS+= -logg
+ifeq ($(CONFIG_LIBVORBIS),yes)
+EXTRALIBS+= -lvorbis -lvorbisenc
+endif
+ifeq ($(CONFIG_LIBTHEORA),yes)
+EXTRALIBS+= -ltheora
+endif
endif
ifeq ($(CONFIG_FAAD),yes)
echo " --prefix=PREFIX install in PREFIX [$prefix]"
echo " --mandir=DIR man documentation in DIR [PREFIX/man]"
echo " --enable-mp3lame enable mp3 encoding via libmp3lame [default=no]"
-echo " --enable-vorbis enable vorbis support via libvorbisenc [default=no]"
+echo " --enable-ogg enable ogg support via libogg [default=no]"
+echo " --enable-vorbis enable vorbis support via libvorbis [default=no]"
+echo " --enable-theora enable theora support via libtheora [default=no]"
echo " --enable-faad enable faad support via libfaad [default=no]"
echo " --enable-faadbin build faad support with runtime linking [default=no]"
echo " --enable-faac enable faac support via libfaac [default=no]"
network="yes"
zlib="yes"
mp3lame="no"
+ogg="no"
vorbis="no"
+theora="no"
faad="no"
faadbin="no"
faac="no"
;;
--enable-mp3lame) mp3lame="yes"
;;
+ --enable-ogg) ogg="yes"
+ ;;
--enable-vorbis) vorbis="yes"
;;
+ --enable-theora) theora="yes"
+ ;;
--enable-faad) faad="yes"
;;
--enable-faadbin) faadbin="yes"
esac
done
+if test "$theora" = "yes" ; then
+ if test "$ogg" = "no" ; then
+ echo "Ogg must be enabled to enable Theora"
+ fail="yes"
+ theora="no"
+ fi
+fi
+
+if test "$vorbis" = "yes" ; then
+ if test "$ogg" = "no" ; then
+ echo "Ogg must be enabled to enable Vorbis"
+ fail="yes"
+ vorbis="no"
+ fi
+fi
+
if test "$gpl" != "yes"; then
if test "$pp" != "no" -o "$shared_pp" != "no"; then
echo "The Postprocessing code is under GPL and --enable-gpl is not specified"
echo "gprof enabled $gprof"
echo "zlib enabled $zlib"
echo "mp3lame enabled $mp3lame"
+echo "ogg enabled $ogg"
echo "vorbis enabled $vorbis"
+echo "theora enabled $theora"
echo "faad enabled $faad"
echo "faadbin enabled $faadbin"
echo "faac enabled $faac"
echo "CONFIG_MP3LAME=yes" >> config.mak
fi
+if test "$ogg" = "yes" ; then
+ echo "#define CONFIG_LIBOGG 1" >> $TMPH
+ echo "CONFIG_LIBOGG=yes" >> config.mak
+fi
+
if test "$vorbis" = "yes" ; then
- echo "#define CONFIG_VORBIS 1" >> $TMPH
- echo "CONFIG_VORBIS=yes" >> config.mak
+ echo "#define CONFIG_LIBVORBIS 1" >> $TMPH
+ 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
CODEC_ID_MP3ADU,
CODEC_ID_MP3ON4,
+ CODEC_ID_OGGTHEORA= 0x16000,
+
CODEC_ID_MPEG2TS= 0x20000, /* _FAKE_ codec to indicate a raw MPEG2 transport
stream (only used by libavformat) */
};
extern AVCodec mp2_encoder;
extern AVCodec mp3lame_encoder;
extern AVCodec oggvorbis_encoder;
+extern AVCodec oggtheora_encoder;
extern AVCodec faac_encoder;
extern AVCodec xvid_encoder;
extern AVCodec mpeg1video_encoder;
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;