[FFmpeg-cvslog] Merge commit 'db32f14c3dfd75290b57a086183d6577457beac4'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar  9 22:22:05 2014 +0100| [c68e53f27281abe7d72147edd1326abf7449cdff] | committer: Michael Niedermayer

Merge commit 'db32f14c3dfd75290b57a086183d6577457beac4'

* commit 'db32f14c3dfd75290b57a086183d6577457beac4':
  isom: add "MNG" FourCC

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

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