diff options
| author | gnif2 <gnif2@svn> | 2010-05-11 06:34:09 +0000 |
|---|---|---|
| committer | gnif2 <gnif2@svn> | 2010-05-11 06:34:09 +0000 |
| commit | 6aefbe25098fad3e083c87ff06d1b02d43399728 (patch) | |
| tree | eb9aef9eca357d046c74a99d260f7f1f4aa2562f /configure.in | |
| parent | b308346da1831ab13117153b23b2ebbb70a8004f (diff) | |
added: configure option to enable libvorbis encode support in ffmpeg
reverted: mp3 configure options
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@30014 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/configure.in b/configure.in index 5d2a6c5dfe..3cc8b386ab 100644 --- a/configure.in +++ b/configure.in @@ -184,6 +184,12 @@ AC_ARG_ENABLE([pulse], [use_pulse=$enableval], [use_pulse=yes]) +AC_ARG_ENABLE([ffmpeg_libvorbis], + [AS_HELP_STRING([--enable-ffmpeg-libvorbis], + [enable FFmpeg vorbis encoding (default is no)])], + [use_ffmpeg_libvorbis=$enableval], + [use_ffmpeg_libvorbis=no]) + AC_ARG_ENABLE([faac], [AS_HELP_STRING([--enable-faac], [enable FAAC support (default is yes)])], @@ -1328,11 +1334,10 @@ XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/ffmpeg], [ --disable-muxers \ --enable-muxer=spdif \ --enable-muxer=adts \ - --enable-muxer=mp3 \ --disable-encoders \ --enable-encoder=ac3 \ --enable-encoder=aac \ - --enable-encoder=mp3 \ + `if test "$use_ffmpeg_libvorbis" == "yes"; then echo --enable-libvorbis --enable-muxer=ogg; else echo --disable-libvorbis; fi` \ --disable-devices \ --disable-ffplay \ --disable-ffserver \ @@ -1362,11 +1367,10 @@ XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/ffmpeg], [ --disable-muxers \ --enable-muxer=spdif \ --enable-muxer=adts \ - --enable-muxer=mp3 \ --disable-encoders \ --enable-encoder=ac3 \ --enable-encoder=aac \ - --enable-encoder=mp3 \ + `if test "$use_ffmpeg_libvorbis" == "yes"; then echo --enable-libvorbis --enable-muxer=ogg; else echo --disable-libvorbis; fi` \ --disable-decoder=mpeg_xvmc \ --disable-devices \ --disable-ffplay \ |