[FFmpeg-cvslog] Merge commit 'a54f03bf07da964a1b04b03b85bc39deba76efa4'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul  9 23:57:20 2014 +0200| [c67690f854452df397f3f735d0ff107a3fe51d87] | committer: Michael Niedermayer

Merge commit 'a54f03bf07da964a1b04b03b85bc39deba76efa4'

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

Conflicts:
	libavutil/version.h

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

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