Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 26 Jun 2011 00:31:32 +0000 (02:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 26 Jun 2011 00:31:32 +0000 (02:31 +0200)
commit4ccb7911baa761d373e28068b93db13a76a780b8
tree56c38b10ad0eb94e94f1b7a56a4ec6ca115945e4
parent5fba761f6e3ff1e3d27fdefe257a9bb31d2cc7ea
parentd0ce090ec553c88eb8e9c303156017417d4599cc
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>
configure
libavcodec/Makefile
libavcodec/aacpsy.c
libavdevice/Makefile
libavfilter/Makefile
libavformat/Makefile
subdir.mak