* commit 'e4fe535d12f4f30df2dd672e30304af112a5a827': mov: Write the display matrix in order Conflicts: libavformat/mov.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'e4fe535d12f4f30df2dd672e30304af112a5a827': mov: Write the display matrix in order Conflicts: libavformat/mov.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>