diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-06-26 02:31:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-26 02:31:32 +0200 |
| commit | 4ccb7911baa761d373e28068b93db13a76a780b8 (patch) | |
| tree | 56c38b10ad0eb94e94f1b7a56a4ec6ca115945e4 /configure | |
| parent | 5fba761f6e3ff1e3d27fdefe257a9bb31d2cc7ea (diff) | |
| parent | d0ce090ec553c88eb8e9c303156017417d4599cc (diff) | |
| download | ffmpeg-4ccb7911baa761d373e28068b93db13a76a780b8.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ARM: silence some annoying armcc warnings
ffplay: Remove unused-but-set channels variable from update_sample_display().
build: Add DEP_LIBS dependency directly to the shared library build rule.
build: Remove multiple inclusion guards from config.mak.
build: Remove redundant config.mak includes from subdirectory Makefiles.
aacenc: Mark psy_3gpp_window() as av_unused.
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -3123,6 +3123,8 @@ elif enabled armcc; then add_cflags -W${armcc_opt},--diag_suppress=1207 add_cflags -W${armcc_opt},--diag_suppress=1293 # assignment in condition add_cflags -W${armcc_opt},--diag_suppress=3343 # hardfp compat + add_cflags -W${armcc_opt},--diag_suppress=167 # pointer sign + add_cflags -W${armcc_opt},--diag_suppress=513 # pointer sign elif enabled tms470; then add_cflags -pds=824 -pds=837 elif enabled pathscale; then @@ -3317,8 +3319,6 @@ config_files="$TMPH config.mak" cat > config.mak <<EOF # Automatically generated by configure - do not modify! -ifndef FFMPEG_CONFIG_MAK -FFMPEG_CONFIG_MAK=1 FFMPEG_CONFIGURATION=$FFMPEG_CONFIGURATION prefix=$prefix LIBDIR=\$(DESTDIR)$libdir @@ -3461,7 +3461,6 @@ SEEK_TESTS=$(print_enabled -n _test $SEEK_TESTS) EOF echo "#endif /* FFMPEG_CONFIG_H */" >> $TMPH -echo "endif # FFMPEG_CONFIG_MAK" >> config.mak # Do not overwrite an unchanged config.h to avoid superfluous rebuilds. cp_if_changed $TMPH config.h |