Merge commit '6d7b22fb8f247a51e668c83b2f2460a9b3e948a8'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Mar 2014 13:42:37 +0000 (14:42 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Mar 2014 13:50:53 +0000 (14:50 +0100)
* commit '6d7b22fb8f247a51e668c83b2f2460a9b3e948a8':
  isom: fix C99-style declaration

See: cd0982e1899d24df4f1989ed857de5e477c64763
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge