Merge commit '48952116352ab03565cc14805e0f1d63cf0318fe' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Dec 2014 11:21:07 +0000 (12:21 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Dec 2014 11:21:31 +0000 (12:21 +0100)
commit849f55368c3609d962adf5a729e192de9027b165
tree3a1045bbd68ddf490c891e37349be2ffc96f89ce
parentb86c2640f65444981718d74dedb85a249d66435c
parent48952116352ab03565cc14805e0f1d63cf0318fe
Merge commit '48952116352ab03565cc14805e0f1d63cf0318fe' into release/2.4

* commit '48952116352ab03565cc14805e0f1d63cf0318fe':
  on2avc: check number of channels

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