Merge commit '5a69ded12aaf2bd3baed5d1d644ef23cfecef87f'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Jun 2014 10:09:15 +0000 (12:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Jun 2014 10:09:20 +0000 (12:09 +0200)
commit593dc5aed907594753862828a461f58b5d48a0e0
treed35775606558d3baabc747a0ba3bb88926decef3
parentb152152df3b778d0a86dcda5d4f5d065b4175a7b
parent5a69ded12aaf2bd3baed5d1d644ef23cfecef87f
Merge commit '5a69ded12aaf2bd3baed5d1d644ef23cfecef87f'

* commit '5a69ded12aaf2bd3baed5d1d644ef23cfecef87f':
  vf_showinfo: print display transformation values

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/vf_showinfo.c