diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-11-11 14:49:30 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-11-11 14:49:30 +0100 |
| commit | 4e8f1c6fb0022ef9ddfe95faa0cf7e301d165f61 (patch) | |
| tree | 416ba3e466c541f11712af6d09dc959363ae00cb /libavfilter/af_join.c | |
| parent | 6375ba827a6d9587b5f62a1ed7482a6ed20718db (diff) | |
| parent | 1062880d69a4fdc8d8929dd5c22bb447182f1c41 (diff) | |
| download | ffmpeg-4e8f1c6fb0022ef9ddfe95faa0cf7e301d165f61.tar.gz | |
Merge commit '1062880d69a4fdc8d8929dd5c22bb447182f1c41'
* commit '1062880d69a4fdc8d8929dd5c22bb447182f1c41':
vf_fps: set frame_rate.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavfilter/af_join.c')
0 files changed, 0 insertions, 0 deletions