[FFmpeg-cvslog] Merge commit 'c837b38dd33a11c3810e988a60193a858eb4f58c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 10 11:12:08 2013 +0100| [be894d6caeafdd6826cbc0f46030eab7c82c7cfc] | committer: Michael Niedermayer

Merge commit 'c837b38dd33a11c3810e988a60193a858eb4f58c'

* commit 'c837b38dd33a11c3810e988a60193a858eb4f58c':
  au: move skipping of unused data to before parameter validation
  au: do not arbitrarily limit channel count

Conflicts:
	libavformat/au.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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