[FFmpeg-cvslog] Merge commit 'cee4490b521fd0d02476d46aa2598af24fb8d686'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 19 13:36:25 2014 +0100| [e67496fe9db3a25ac1bc08bd77eca95b79d25cac] | committer: Michael Niedermayer

Merge commit 'cee4490b521fd0d02476d46aa2598af24fb8d686'

* commit 'cee4490b521fd0d02476d46aa2598af24fb8d686':
  on2avc: check number of channels

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

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