[FFmpeg-cvslog] Merge commit '31e558fbcfec8fa9fddf564ab8360384706e41c0'

[Michael Niedermayer]

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

Merge commit '31e558fbcfec8fa9fddf564ab8360384706e41c0'

* commit '31e558fbcfec8fa9fddf564ab8360384706e41c0':
  isom: add "NO16" FourCC

Conflicts:
	libavformat/isom.c

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

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