[xiph-commits] r10706 - trunk/ffmpeg2theora

[j at svn.xiph.org]

Author: j
Date: 2006-01-08 17:27:10 -0800 (Sun, 08 Jan 2006)
New Revision: 10706

Modified:
   trunk/ffmpeg2theora/configure.ac
   trunk/ffmpeg2theora/get_ffmpeg_cvs.sh
Log:
first check for ogg vorbis and theora

Modified: trunk/ffmpeg2theora/configure.ac
===================================================================
--- trunk/ffmpeg2theora/configure.ac	2006-01-08 23:17:41 UTC (rev 10705)
+++ trunk/ffmpeg2theora/configure.ac	2006-01-09 01:27:10 UTC (rev 10706)
@@ -22,24 +22,22 @@
 AC_MSG_RESULT(no)
 )
 
-PKG_CHECK_MODULES(FFMPEG, libavformat libavcodec, HAVE_FFMPEG=yes, HAVE_FFMPEG=no)
-if test x$HAVE_FFMPEG = xno; then
-    export PKG_CONFIG_PATH=./ffmpeg:$PKG_CONFIG_PATH
-    PKG_CHECK_MODULES(FFMPEG, libavformat libavcodec, HAVE_FFMPEG=yes, 
+PKG_CHECK_MODULES(XIPH,ogg >= 1.1 vorbis vorbisenc theora )
+
+AC_SUBST(XIPH_CFLAGS)
+AC_SUBST(XIPH_LIBS)
+
+PKG_CONFIG_PATH=./ffmpeg:$PKG_CONFIG_PATH
+PKG_CHECK_MODULES(FFMPEG, libavformat libavcodec, HAVE_FFMPEG=yes, 
         AC_MSG_ERROR([
 
 could not find ffmpeg. please update PKG_CONFIG_PATH to point to ffmpegs source
 folder or run ./get_ffmpeg_cvs.sh (for more information see INSTALL)
 ])
 )
-fi
 AC_SUBST(FFMPEG_CFLAGS)
 AC_SUBST(FFMPEG_LIBS)
 
-PKG_CHECK_MODULES(XIPH,ogg >= 1.1 vorbis vorbisenc theora )
-
-AC_SUBST(XIPH_CFLAGS)
-AC_SUBST(XIPH_LIBS)
 AC_OUTPUT([
 	Makefile
 	kino_export/Makefile

Modified: trunk/ffmpeg2theora/get_ffmpeg_cvs.sh
===================================================================
--- trunk/ffmpeg2theora/get_ffmpeg_cvs.sh	2006-01-08 23:17:41 UTC (rev 10705)
+++ trunk/ffmpeg2theora/get_ffmpeg_cvs.sh	2006-01-09 01:27:10 UTC (rev 10706)
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 #optional, if you have the libs installed:
-#extra="--enable-faad --enable-dts --enable-libgsm --enable-amr_nb --enable-amr_nb-fixed --enable-amr_wb --enable-amr_if2"
+#extra="--enable-faad --enable-libgsm --enable-amr_nb --enable-amr_nb-fixed --enable-amr_wb --enable-amr_if2"
 
-common="--enable-libogg --enable-theora --enable-a52  --enable-gpl --disable-encoders"
+common="--enable-libogg --enable-theora --enable-a52 --enable-dts --enable-gpl --disable-encoders"
 
 #linux
 options="$common --enable-pthreads $extra"