Merge commit 'cf18e777aed9f73011c7ab7cbab8003189d4b9d8'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Mar 2015 00:10:06 +0000 (01:10 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Mar 2015 00:10:06 +0000 (01:10 +0100)
commit750cf4e5374caeef1f5174953d5b159d92abfe86
treee11f16d94bc570a757a7e03acd0920ea62927d28
parent519868de7d9c99876efcaf57d6a9683c22732cde
parentcf18e777aed9f73011c7ab7cbab8003189d4b9d8
Merge commit 'cf18e777aed9f73011c7ab7cbab8003189d4b9d8'

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

Conflicts:
libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/movenc.c