Imported Debian version 2.5.0~trusty1.1

[deb_ffmpeg.git] / ffmpeg / doc / decoders.texi

diff --git a/ffmpeg/doc/decoders.texi b/ffmpeg/doc/decoders.texi
index 6910dc1c6187cad6d192b8babaf743ca1d0a05b7..01fca9fc55c5ed4e23a914c3e6f8b06d8c1ab3ac 100644 (file)
--- a/ffmpeg/doc/decoders.texi
+++ b/ffmpeg/doc/decoders.texi
@@ -190,6 +190,15 @@ The format for this option is a string containing 16 24-bits hexadecimal
 numbers (without 0x prefix) separated by comas, for example @code{0d00ee,
 ee450d, 101010, eaeaea, 0ce60b, ec14ed, ebff0b, 0d617a, 7b7b7b, d1d1d1,
 7b2a0e, 0d950c, 0f007b, cf0dec, cfa80c, 7c127b}.
+
+@item ifo_palette
+Specify the IFO file from which the global palette is obtained.
+(experimental)
+
+@item forced_subs_only
+Only decode subtitle entries marked as forced. Some titles have forced
+and non-forced subtitles in the same track. Setting this flag to @code{1}
+will only keep the forced subtitles. Default value is @code{0}.
 @end table
 
 @section libzvbi-teletext