diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-07-27 20:56:59 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-08-12 13:27:30 +0200 |
| commit | 6291d7e41605c0b1e9debfae8a2b1d4cf7b0e0b3 (patch) | |
| tree | ce39de2c1a0f9a48da739fc10a192cca0345efff /configure | |
| parent | 791a86c37a03b94207bc2d0ad4cbe7f39d7e495a (diff) | |
| download | ffmpeg-6291d7e41605c0b1e9debfae8a2b1d4cf7b0e0b3.tar.gz | |
Make a copy of ffmpeg under a new name -- avconv.
It will be further developed with a few incompatible changes.
ffmpeg.c will stay as is for some time, so any scripts using it won't be
broken.
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -65,7 +65,7 @@ Standard options: --disable-logging do not log configure debug information --prefix=PREFIX install in PREFIX [$prefix] --bindir=DIR install binaries in DIR [PREFIX/bin] - --datadir=DIR install data files in DIR [PREFIX/share/ffmpeg] + --datadir=DIR install data files in DIR [PREFIX/share/avconv] --libdir=DIR install libs in DIR [PREFIX/lib] --shlibdir=DIR install shared libs in DIR [PREFIX/lib] --incdir=DIR install includes in DIR [PREFIX/include] @@ -81,6 +81,7 @@ Configuration options: and binaries will be unredistributable [no] --disable-doc do not build documentation --disable-ffmpeg disable ffmpeg build + --disable-avconv disable avconv build --disable-avplay disable avplay build --disable-avprobe disable avprobe build --disable-avserver disable avserver build @@ -913,6 +914,7 @@ CONFIG_LIST=" dxva2 fastdiv ffmpeg + avconv avplay avprobe avserver @@ -1489,6 +1491,8 @@ postproc_deps="gpl" # programs ffmpeg_deps="avcodec avformat swscale" ffmpeg_select="buffer_filter" +av_deps="avcodec avformat swscale" +av_select="buffer_filter" avplay_deps="avcodec avformat swscale sdl" avplay_select="rdft" avprobe_deps="avcodec avformat" @@ -1595,7 +1599,7 @@ logfile="config.log" # installation paths prefix_default="/usr/local" bindir_default='${prefix}/bin' -datadir_default='${prefix}/share/ffmpeg' +datadir_default='${prefix}/share/avconv' incdir_default='${prefix}/include' libdir_default='${prefix}/lib' mandir_default='${prefix}/share/man' @@ -1635,6 +1639,7 @@ enable debug enable doc enable fastdiv enable ffmpeg +enable avconv enable avplay enable avprobe enable avserver @@ -3284,7 +3289,7 @@ cat > $TMPH <<EOF #define LIBAV_CONFIG_H #define LIBAV_CONFIGURATION "$(c_escape $LIBAV_CONFIGURATION)" #define LIBAV_LICENSE "$(c_escape $license)" -#define FFMPEG_DATADIR "$(eval c_escape $datadir)" +#define AVCONV_DATADIR "$(eval c_escape $datadir)" #define CC_TYPE "$cc_type" #define CC_VERSION $cc_version #define restrict $_restrict |