[FFmpeg-cvslog] Merge commit '18f2514c4037befd37b02e4d4f10c159edf3b26f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May  1 17:13:05 2014 +0200| [7426acff1aed209bc7db4c87697a5931e177eaf1] | committer: Michael Niedermayer

Merge commit '18f2514c4037befd37b02e4d4f10c159edf3b26f'

* commit '18f2514c4037befd37b02e4d4f10c159edf3b26f':
  mov: export stsd Compressorname in metadata

Conflicts:
	libavformat/mov.c

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

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