[FFmpeg-cvslog] Merge commit 'a9221e39600a31ee13e736e9e47743cde23f0280'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Sep 29 23:45:56 2013 +0200| [7057cc861d108b2a2e776303949feb5337e24a08] | committer: Michael Niedermayer

Merge commit 'a9221e39600a31ee13e736e9e47743cde23f0280'

* commit 'a9221e39600a31ee13e736e9e47743cde23f0280':
  electronicarts: Add more sanity checking for the number of channels

Note: This check is probably unnecessary
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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