]> git.sesse.net Git - ffmpeg/commitdiff
Merge remote-tracking branch 'cigaes/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Aug 2014 17:42:34 +0000 (19:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Aug 2014 17:42:38 +0000 (19:42 +0200)
* cigaes/master:
  lavfi/avf_showspectrum: check RDFT context init.
  lavfi/avf_showspectrum: add full frame sliding mode.
  lavfi/avf_showspectrum: use automatic framing.
  lavfi/avf_showspectrum: do not push the frame at EOF.
  lavfi/avf_showspectrum: fix output pts computation.
  lavfi/avf_showspectrum: set output frame rate.

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

Trivial merge