diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-14 19:42:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-14 19:42:38 +0200 |
| commit | c6c345ea928bafc4097a1b99a8ce18556a38473e (patch) | |
| tree | a4789362ce5d3ac4333a79c6fbf0cf3970119065 /libavformat/asf.h | |
| parent | 37bfeca78cf3e00934427e59350441ca097de84c (diff) | |
| parent | 638eec2ac34b7f65a8e84203ea4292440bc8fe50 (diff) | |
| download | ffmpeg-c6c345ea928bafc4097a1b99a8ce18556a38473e.tar.gz | |
Merge remote-tracking branch 'cigaes/master'
* 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>
Diffstat (limited to 'libavformat/asf.h')
0 files changed, 0 insertions, 0 deletions