Merge commit 'cee4490b521fd0d02476d46aa2598af24fb8d686'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 12:36:25 +0000 (13:36 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 12:39:41 +0000 (13:39 +0100)
commite67496fe9db3a25ac1bc08bd77eca95b79d25cac
treea0d8767b70341af1e3136c91890a07349ee3c20d
parentc266d0e1bd56272939feb4eeee91b927a27c0953
parentcee4490b521fd0d02476d46aa2598af24fb8d686
Merge commit 'cee4490b521fd0d02476d46aa2598af24fb8d686'

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

See: 550f3e9df3410b3dd975e590042c0d83e20a8da3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/on2avc.c