[FFmpeg-cvslog] Merge commit '853cc025d63ee2539fc0460dab62c5b9a3fd2043'

Michael Niedermayer git at videolan.org
Mon May 19 19:28:27 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May 19 19:21:53 2014 +0200| [07941c2cb28d6a80f628e035d61ab437d9719bf0] | committer: Michael Niedermayer

Merge commit '853cc025d63ee2539fc0460dab62c5b9a3fd2043'

* commit '853cc025d63ee2539fc0460dab62c5b9a3fd2043':
  mov: store display matrix in a stream side data

Conflicts:
	libavformat/isom.h
	libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list