diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-31 01:36:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-31 01:36:47 +0100 |
| commit | f76cd09d466efffdb51b418ce2ce34c7a7e6d342 (patch) | |
| tree | f7d7e13c60918eada7acb07551caeb520df189af /doc | |
| parent | fc8d59fa6f4ca410fcbf88b54aee3a4fbf73c47f (diff) | |
| download | ffmpeg-f76cd09d466efffdb51b418ce2ce34c7a7e6d342.tar.gz | |
doc: Add documentation for the whitelist options
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/codecs.texi | 4 | ||||
| -rw-r--r-- | doc/formats.texi | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/doc/codecs.texi b/doc/codecs.texi index 5a1abb86cd..b7247388ef 100644 --- a/doc/codecs.texi +++ b/doc/codecs.texi @@ -1114,6 +1114,10 @@ Interlaced video, bottom coded first, top displayed first Set to 1 to disable processing alpha (transparency). This works like the @samp{gray} flag in the @option{flags} option which skips chroma information instead of alpha. Default is 0. + +@item codec_whitelist @var{list} (@emph{input}) +"," separated List of allowed decoders. By default all are allowed. + @end table @c man end CODEC OPTIONS diff --git a/doc/formats.texi b/doc/formats.texi index 027510eb6d..ade1f94d28 100644 --- a/doc/formats.texi +++ b/doc/formats.texi @@ -168,6 +168,10 @@ The offset is added by the muxer to the output timestamps. Specifying a positive offset means that the corresponding streams are delayed bt the time duration specified in @var{offset}. Default value is @code{0} (meaning that no offset is applied). + +@item format_whitelist @var{list} (@emph{input}) +"," separated List of allowed demuxers. By default all are allowed. + @end table @c man end FORMAT OPTIONS |