[FFmpeg-cvslog] Merge commit 'cf9861dea5d42d0b5a6cf0609b9624525d96c1e0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 17 20:55:47 2015 +0100| [de732a82b618680743375cad4bd88668ee871abd] | committer: Michael Niedermayer

Merge commit 'cf9861dea5d42d0b5a6cf0609b9624525d96c1e0'

* commit 'cf9861dea5d42d0b5a6cf0609b9624525d96c1e0':
  isom: Add X-Com Radvision FourCC

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

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