[FFmpeg-cvslog] Merge commit 'cb8f70c96e14c1b4824ef23d21d78d10fc5a4b93'
Michael Niedermayer
git at videolan.org
Thu Aug 29 13:22:25 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug 29 13:02:28 2013 +0200| [88262e1c1d5876ca031ea40901609e4e8d4d1f01] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=88262e1c1d5876ca031ea40901609e4e8d4d1f01
---
More information about the ffmpeg-cvslog
mailing list