Merge commit '1339009c4924a20e872aa62897097bf5d071157c'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 11 Nov 2015 14:01:15 +0000 (15:01 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 11 Nov 2015 14:01:15 +0000 (15:01 +0100)
commit51a3e525935efc60d8d23050f0daafeb82a3df57
tree1d1ae3a561de848f27507ec3c08f8a5984ee10f2
parent1b86a6bb2cea5038a546a35d8ea844cf5487081a
parent1339009c4924a20e872aa62897097bf5d071157c
Merge commit '1339009c4924a20e872aa62897097bf5d071157c'

* commit '1339009c4924a20e872aa62897097bf5d071157c':
  vf_showinfo: show timebase & framerate too

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavfilter/vf_showinfo.c