Merge commit 'bddd8cbf68551f6405b2bf77cc3e212af9fbe834'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 19 May 2014 17:12:30 +0000 (19:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 19 May 2014 17:12:30 +0000 (19:12 +0200)
commitef1d4ee2f8b621a009d482d5b183a905bcb1cd74
tree88d5e961383f04d5c1e521242dc2e0ceb7eedd1b
parentaf72f62d7b2ab00d6f69c0838f662beb566862d8
parentbddd8cbf68551f6405b2bf77cc3e212af9fbe834
Merge commit 'bddd8cbf68551f6405b2bf77cc3e212af9fbe834'

* commit 'bddd8cbf68551f6405b2bf77cc3e212af9fbe834':
  Add transformation matrix API.

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
doc/APIchanges
libavcodec/avcodec.h
libavcodec/utils.c
libavutil/Makefile
libavutil/display.c
libavutil/display.h
libavutil/frame.h
libavutil/version.h