[FFmpeg-cvslog] Merge commit 'e4fe535d12f4f30df2dd672e30304af112a5a827'
Michael Niedermayer
git at videolan.org
Tue Mar 24 01:24:41 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 24 01:14:31 2015 +0100| [dfea1acb21f3a3945d04537855ab6412c2b4e323] | committer: Michael Niedermayer
Merge commit 'e4fe535d12f4f30df2dd672e30304af112a5a827'
* commit 'e4fe535d12f4f30df2dd672e30304af112a5a827':
mov: Write the display matrix in order
Conflicts:
libavformat/mov.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dfea1acb21f3a3945d04537855ab6412c2b4e323
---
More information about the ffmpeg-cvslog
mailing list