[FFmpeg-cvslog] Merge commit 'cf18e777aed9f73011c7ab7cbab8003189d4b9d8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 20 01:10:06 2015 +0100| [750cf4e5374caeef1f5174953d5b159d92abfe86] | committer: Michael Niedermayer

Merge commit 'cf18e777aed9f73011c7ab7cbab8003189d4b9d8'

* commit 'cf18e777aed9f73011c7ab7cbab8003189d4b9d8':
  movenc: write the display transform matrix

Conflicts:
	libavformat/movenc.c

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

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