[FFmpeg-devel] [WIP][PATCH 1/2] doc/codecs: Various updates
Timothy Gu
timothygu99 at gmail.com
Mon Sep 16 04:08:57 CEST 2013
Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
---
Can someone (Nicolas?) explain the usage of sub_charenc_mode option so I can
add it to the doc? Thanks.
---
doc/codecs.texi | 39 ++++++++++++++++++++++++++-------------
1 file changed, 26 insertions(+), 13 deletions(-)
diff --git a/doc/codecs.texi b/doc/codecs.texi
index 6ff2a65..7f7f35c 100644
--- a/doc/codecs.texi
+++ b/doc/codecs.texi
@@ -36,6 +36,8 @@ Set generic flags.
Possible values:
@table @samp
+ at item unaligned
+Allow decoders to produce unaligned output
@item mv4
Use four motion vector by macroblock (mpeg4).
@item qpel
@@ -84,9 +86,6 @@ Apply interlaced motion estimation.
Use closed gop.
@end table
- at item sub_id @var{integer}
-Deprecated, currently unused.
-
@item me_method @var{integer} (@emph{encoding,video})
Set motion estimation method.
@@ -386,10 +385,6 @@ Possible values:
@item simplemmx
- at item libmpeg2mmx
-
- at item mmi
-
@item arm
@item altivec
@@ -406,10 +401,6 @@ Possible values:
@item simplealpha
- at item h264
-
- at item vp3
-
@item ipp
@item xvidmmx
@@ -772,8 +763,6 @@ Set noise reduction.
Set number of bits which should be loaded into the rc buffer before
decoding starts.
- at item inter_threshold @var{integer} (@emph{encoding,video})
-
@item flags2 @var{flags} (@emph{decoding/encoding,audio,video})
Possible values:
@@ -784,6 +773,8 @@ allow non spec compliant speedup tricks
Deprecated, use mpegvideo private options instead
@item noout
skip bitstream encoding
+ at item ignorecrop
+Ignore cropping information from sps
@item local_header
place global headers at every keyframe instead of in extradata
@item chunks
@@ -847,6 +838,10 @@ Possible values:
@item aac_eld
+ at item mpeg2_aac_low
+
+ at item mpeg2_aac_he
+
@item dts
@item dts_es
@@ -1065,6 +1060,24 @@ Set sample format audio decoders should prefer. Default value is
@item sub_charenc @var{encoding} (@emph{decoding,subtitles})
Set the input subtitles character encoding.
+
+ at item sub_charenc_mode @var{flags} (@emph{input,subtitles})
+Set input text subtitles character encoding mode
+
+Possible values:
+ at table @samp
+ at item do_nothing
+Do not do anything with subtitle encoding.
+
+ at item auto
+Automatic. This the default.
+
+ at item pre_decoder
+
+ at end table
+ at item refcounted_frames @var{integer} (@emph{input,audio,video})
+Set to 1 to enable ref-counted_frames. Default is 0.
+
@end table
@c man end CODEC OPTIONS
--
1.8.1.2
More information about the ffmpeg-devel
mailing list