Merge commit '46fd6e4f2ebbcd5a00847cdb05fe416466d06d37' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 12 May 2013 12:11:03 +0000 (14:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 12 May 2013 12:11:03 +0000 (14:11 +0200)
commit9767d7513cbc24f01221965c95e65a73bea780d2
treef8081bbab248d94222227b1e990c25aae7f3a22e
parentd2b9da2f3797de28fda72a96bf8f06608121c6ee
parent46fd6e4f2ebbcd5a00847cdb05fe416466d06d37
Merge commit '46fd6e4f2ebbcd5a00847cdb05fe416466d06d37' into release/1.1

* commit '46fd6e4f2ebbcd5a00847cdb05fe416466d06d37':
  aac: check the maximum number of channels
  update Changelog
  riff: check for eof if chunk size and code are 0
  oggdec: fix faulty cleanup prototype

Conflicts:
Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
libavcodec/aacdec.c
libavformat/riff.c