ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Fri Oct 31 01:36:47 2014 +0100| [f76cd09d466efffdb51b418ce2ce34c7a7e6d342] | committer: Michael Niedermayer
doc: Add documentation for the whitelist options Signed-off-by: Michael Niedermayer <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f76cd09d466efffdb51b418ce2ce34c7a7e6d342 --- doc/codecs.texi | 4 ++++ doc/formats.texi | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/doc/codecs.texi b/doc/codecs.texi index 5a1abb8..b724738 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 027510e..ade1f94 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 _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
