[FFmpeg-cvslog] Merge commit '6d7b22fb8f247a51e668c83b2f2460a9b3e948a8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 17 14:42:37 2014 +0100| [85d28a8656814fbdce9b29abc03bf8efb3122bed] | committer: Michael Niedermayer

Merge commit '6d7b22fb8f247a51e668c83b2f2460a9b3e948a8'

* commit '6d7b22fb8f247a51e668c83b2f2460a9b3e948a8':
  isom: fix C99-style declaration

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

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