[FFmpeg-cvslog] Merge commit '709e1c91ea7a5bbf2b9a104642572ca7616b224f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May  3 01:04:14 2015 +0200| [0ba65c9f795a1d3ad842f6d3179472e35c73541c] | committer: Michael Niedermayer

Merge commit '709e1c91ea7a5bbf2b9a104642572ca7616b224f'

* commit '709e1c91ea7a5bbf2b9a104642572ca7616b224f':
  avprobe: Print the display matrix from per-stream sidedata

Conflicts:
	avprobe.c

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

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