[FFmpeg-cvslog] Merge commit '46fd6e4f2ebbcd5a00847cdb05fe416466d06d37' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Sun May 12 14:11:03 2013 +0200| [9767d7513cbc24f01221965c95e65a73bea780d2] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9767d7513cbc24f01221965c95e65a73bea780d2
---