Merge commit 'e4fe535d12f4f30df2dd672e30304af112a5a827'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Mar 2015 00:14:31 +0000 (01:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Mar 2015 00:14:31 +0000 (01:14 +0100)
commitdfea1acb21f3a3945d04537855ab6412c2b4e323
tree5eb54b082827af6f57b2ea5fd62570981f9e311a
parent001b28b0211b6501f9ffa1e6187b8a111901464f
parente4fe535d12f4f30df2dd672e30304af112a5a827
Merge commit 'e4fe535d12f4f30df2dd672e30304af112a5a827'

* commit 'e4fe535d12f4f30df2dd672e30304af112a5a827':
  mov: Write the display matrix in order

Conflicts:
libavformat/mov.c
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mov.c
libavutil/display.c
libavutil/display.h
libavutil/version.h