ffmpeg | branch: master | Michael Niedermayer <[email protected]> | 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 <[email protected]>

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



_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to