Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 13 Jul 2012 20:21:38 +0000 (22:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 13 Jul 2012 20:22:24 +0000 (22:22 +0200)
commit674216991d409316155695baeb6b69c22c758815
tree97b390e16c5f2378f193499224a05445d9715bd0
parentaf285072b5d226bb0032b8576d132d01e2d22fa1
parent47aed43990e2bf31d0599d5ac862afa5e264a601
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: Fix APE tag dependencies
  MS Expression Encoder Screen decoder
  libfdk-aac: Allow setting the encoder bandwidth/cutoff frequency

Conflicts:
Changelog
libavcodec/avcodec.h
libavcodec/version.h
libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/libfdk-aacenc.c
libavcodec/mss4.c
libavcodec/version.h
libavformat/Makefile
libavformat/riff.c