diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 13:02:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 13:02:28 +0200 |
| commit | 88262e1c1d5876ca031ea40901609e4e8d4d1f01 (patch) | |
| tree | af5d7dd6de1806b420f6d2cdc7668eed6f7d3c9a /libavfilter/af_join.c | |
| parent | d49f2603bedb780a6cedff4ac790605679cf4029 (diff) | |
| parent | cb8f70c96e14c1b4824ef23d21d78d10fc5a4b93 (diff) | |
| download | ffmpeg-88262e1c1d5876ca031ea40901609e4e8d4d1f01.tar.gz | |
Merge commit 'cb8f70c96e14c1b4824ef23d21d78d10fc5a4b93'
* commit 'cb8f70c96e14c1b4824ef23d21d78d10fc5a4b93':
vf_fps: use double constants for default/min/max for start_time
Conflicts:
libavfilter/vf_fps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_join.c')
0 files changed, 0 insertions, 0 deletions