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>

diff --cc configure
index 384da2b,7031717..65a8884
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -3317,9 -3250,7 +3319,7 @@@ config_files="$TMPH config.mak
  
  cat > config.mak <<EOF
  # Automatically generated by configure - do not modify!
- ifndef FFMPEG_CONFIG_MAK
- FFMPEG_CONFIG_MAK=1
 -LIBAV_CONFIGURATION=$LIBAV_CONFIGURATION
 +FFMPEG_CONFIGURATION=$FFMPEG_CONFIGURATION
  prefix=$prefix
  LIBDIR=\$(DESTDIR)$libdir
  SHLIBDIR=\$(DESTDIR)$shlibdir
@@@ -3460,8 -3390,7 +3460,7 @@@ LAVFI_TESTS=$(print_enabled  -n _test $
  SEEK_TESTS=$(print_enabled   -n _test $SEEK_TESTS)
  EOF
  
 -echo "#endif /* LIBAV_CONFIG_H */" >> $TMPH
 +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

diff --cc libavcodec/Makefile
Simple merge

diff --cc libavcodec/aacpsy.c
Simple merge

diff --cc libavdevice/Makefile
Simple merge

diff --cc libavfilter/Makefile
Simple merge

diff --cc libavformat/Makefile
Simple merge

diff --cc subdir.mak
Simple merge