configure.ac: Slim down the build of 'prefered' ffmpeg snapshot to disable compilation of things we don't need.

Original commit message from CVS:
* configure.ac:
Slim down the build of 'prefered' ffmpeg snapshot to disable compilation
of things we don't need.
* ffmpegrev:
Update our 'prefered' ffmpeg snapshot to rev 15004. This has the fix for a nasty
wma2 decoding regression.
This commit is contained in:
Edward Hervey 2008-08-28 08:45:48 +00:00
parent efa8be0ec3
commit 7bb23479a1
4 changed files with 12 additions and 4 deletions

View file

@ -1,3 +1,12 @@
2008-08-28 Edward Hervey <edward.hervey@collabora.co.uk>
* configure.ac:
Slim down the build of 'prefered' ffmpeg snapshot to disable compilation
of things we don't need.
* ffmpegrev:
Update our 'prefered' ffmpeg snapshot to rev 15004. This has the fix for a nasty
wma2 decoding regression.
2008-08-18 Thijs Vermeir <thijsvermeir@gmail.com>
* configure.ac:

2
common

@ -1 +1 @@
Subproject commit d70ca17ae6fbe6020996e4567275d5e14972ed45
Subproject commit 8d494854a6018336a80ece82ceb3df0033e2da9c

View file

@ -282,7 +282,7 @@ else
AC_DEFINE(HAVE_AVI_H)
AC_DEFINE([FFMPEG_SOURCE], ["local snapshot"], [Describes where the FFmpeg libraries come from.])
# Enable shared and static so that we get .a files, but with PIC code.
ac_configure_args="$ac_configure_args --disable-vhook --disable-ffserver --disable-ffplay --enable-postproc --enable-gpl --enable-static --enable-shared --disable-encoder=flac --disable-decoder=cavs"
ac_configure_args="$ac_configure_args --disable-vhook --disable-ffserver --disable-ffplay --enable-postproc --enable-gpl --enable-static --enable-shared --disable-encoder=flac --disable-decoder=cavs --disable-protocols --disable-devices --disable-network"
case $host_os in
# Unfortunately, in Mac OS 10.5 the current rev of ffmpeg builds
# some non-PIC code into the .a file. See

View file

@ -1,5 +1,4 @@
# 6315, 10844, 10876, 10910, 10932, 10939
FFMPEG_REVISION=14348
FFMPEG_REVISION=15004
FFMPEG_CO_DIR=gst-libs/ext/ffmpeg
FFMPEG_SVN=svn://svn.mplayerhq.hu/ffmpeg/trunk
# Because ffmpeg checks out libswscale via an svn:externals, checking