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)
* commit '5a69ded12aaf2bd3baed5d1d644ef23cfecef87f':
  vf_showinfo: print display transformation values

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

Simple merge