diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-16 13:07:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-16 13:07:10 +0100 |
| commit | 3db32ec119e5a7811e7ee1d41e3becc261fbb296 (patch) | |
| tree | c7a17b1094082626e7c85bfb8752e385bc8973c5 /configure | |
| parent | 926481078b4f930ac9bb9ca2b4ab660cc9190935 (diff) | |
| parent | bf5f46b4cc47b7a4568119f224057d4ff91b6cdd (diff) | |
| download | ffmpeg-3db32ec119e5a7811e7ee1d41e3becc261fbb296.tar.gz | |
Merge commit 'bf5f46b4cc47b7a4568119f224057d4ff91b6cdd'
* commit 'bf5f46b4cc47b7a4568119f224057d4ff91b6cdd':
APIChanges: add entry for av_read_packet deprecation
mxfdec: fix typo in mxf_read_seek()
avserver: use freopen to redirect stdin/out/err to /dev/null
avserver: remove daemon mode
configure: Check for -Werror parameters on clang
doxygen: remove obsolete options from Doxyfile
configure: Add option to disable all command line programs
Conflicts:
Changelog
configure
doc/APIchanges
doc/ffserver.conf
doc/ffserver.texi
ffserver.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 16 |
1 files changed, 12 insertions, 4 deletions
@@ -101,6 +101,13 @@ Configuration options: --enable-gray enable full grayscale support (slower color) --disable-swscale-alpha disable alpha channel support in swscale +Program options: + --disable-programs do not build command line programs + --disable-ffmpeg disable ffmpeg build + --disable-ffplay disable ffplay build + --disable-ffprobe disable ffprobe build + --disable-ffserver disable ffserver build + Documentation options: --disable-doc do not build documentation --disable-htmlpages do not build HTML documentation pages @@ -109,10 +116,6 @@ Documentation options: --disable-txtpages do not build text documentation pages Component options: - --disable-ffmpeg disable ffmpeg build - --disable-ffplay disable ffplay build - --disable-ffprobe disable ffprobe build - --disable-ffserver disable ffserver build --disable-avdevice disable libavdevice build --disable-avcodec disable libavcodec build --disable-avformat disable libavformat build @@ -2200,6 +2203,9 @@ for opt do ;; --enable-debug=*) debuglevel="$optval" ;; + --disable-programs) + disable $PROGRAM_LIST + ;; --disable-everything) map 'eval unset \${$(toupper ${v%s})_LIST}' $COMPONENT_LIST ;; @@ -3954,6 +3960,8 @@ elif enabled llvm_gcc; then elif enabled clang; then check_cflags -mllvm -stack-alignment=16 check_cflags -Qunused-arguments + check_cflags -Werror=implicit-function-declaration + check_cflags -Werror=missing-prototypes elif enabled armcc; then # 2523: use of inline assembler is deprecated add_cflags -W${armcc_opt},--diag_suppress=2523 |