diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-29 13:19:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-29 13:19:50 +0200 |
| commit | 81487781e739a20deeeb5d3d232c5737e794e80f (patch) | |
| tree | 7f4d30aeb5952a74c7994cd59455e52794553680 /doc | |
| parent | 93704e09c77e991e18c8bc1f0ab7f1e03062150e (diff) | |
| parent | b3673f34149106eedc0457e2a2d4a9ef75a884d5 (diff) | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
lavc/h264_refs: Fix compilation with -DTRACE.
Fix make checkheaders if libmfx is not available.
lavf/gif: Add an option max_gif_delay to limit the frame duration.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/demuxers.texi | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/demuxers.texi b/doc/demuxers.texi index 11dfe1b9c1..3f7c45e843 100644 --- a/doc/demuxers.texi +++ b/doc/demuxers.texi @@ -205,6 +205,11 @@ It accepts the following options: Set the minimum valid delay between frames in hundredths of seconds. Range is 0 to 6000. Default value is 2. +@item max_gif_delay +Set the maximum valid delay between frames in hundredth of seconds. +Range is 0 to 65535. Default value is 65535 (nearly eleven minutes), +the maximum value allowed by the specification. + @item default_delay Set the default delay between frames in hundredths of seconds. Range is 0 to 6000. Default value is 10. |