[FFmpeg-cvslog] Merge commit '48952116352ab03565cc14805e0f1d63cf0318fe' into release/2.4

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sat Dec 20 12:21:07 2014 +0100| [849f55368c3609d962adf5a729e192de9027b165] | committer: Michael Niedermayer

Merge commit '48952116352ab03565cc14805e0f1d63cf0318fe' into release/2.4

* commit '48952116352ab03565cc14805e0f1d63cf0318fe':
  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=849f55368c3609d962adf5a729e192de9027b165
---