diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-21 11:37:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-21 11:37:10 +0200 |
| commit | b69b075ac607419a840da798b089de8ea7630d4b (patch) | |
| tree | 8f3476fc1f20bc3d81813b18a0d4ea4bdfe3cb82 /libavcodec/smvjpegdec.c | |
| parent | 58e12732dbab77fe06b861dcbdc712c5fa065bbd (diff) | |
| parent | 545a0b807cf45b2bbc4c9087a297b741ce00f508 (diff) | |
| download | ffmpeg-b69b075ac607419a840da798b089de8ea7630d4b.tar.gz | |
Merge commit '545a0b807cf45b2bbc4c9087a297b741ce00f508'
* commit '545a0b807cf45b2bbc4c9087a297b741ce00f508':
vf_fps: add 'start_time' option
Conflicts:
doc/filters.texi
libavfilter/vf_fps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/smvjpegdec.c')
0 files changed, 0 insertions, 0 deletions