Merge commit 'a54f03bf07da964a1b04b03b85bc39deba76efa4'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Jul 2014 21:57:20 +0000 (23:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Jul 2014 21:57:20 +0000 (23:57 +0200)
commitc67690f854452df397f3f735d0ff107a3fe51d87
tree2bd4414d0a72eb3eb8cbf70d426039a475254e9d
parente8a966e361a7512ecfb03073074c8b9084229e69
parenta54f03bf07da964a1b04b03b85bc39deba76efa4
Merge commit 'a54f03bf07da964a1b04b03b85bc39deba76efa4'

* commit 'a54f03bf07da964a1b04b03b85bc39deba76efa4':
  display: add matrix flip api

Conflicts:
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libavutil/display.c
libavutil/display.h
libavutil/version.h