[FFmpeg-cvslog] Merge commit 'bddd8cbf68551f6405b2bf77cc3e212af9fbe834'

Michael Niedermayer git at videolan.org
Mon May 19 19:20:34 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May 19 19:12:30 2014 +0200| [ef1d4ee2f8b621a009d482d5b183a905bcb1cd74] | committer: Michael Niedermayer

Merge commit 'bddd8cbf68551f6405b2bf77cc3e212af9fbe834'

* commit 'bddd8cbf68551f6405b2bf77cc3e212af9fbe834':
  Add transformation matrix API.

Conflicts:
	libavcodec/avcodec.h
	libavcodec/utils.c
	libavutil/version.h

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

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





More information about the ffmpeg-cvslog mailing list