diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/APIchanges | 4 | ||||
| -rw-r--r-- | doc/avconv.texi | 8 | ||||
| -rw-r--r-- | doc/general.texi | 2 | ||||
| -rw-r--r-- | doc/indevs.texi | 4 |
4 files changed, 11 insertions, 7 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 9fa0e07640..b146cb00ad 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -174,6 +174,10 @@ API changes, most recent first: 2011-08-14 - 323b930 - lavu 51.12.0 Add av_fifo_peek2(), deprecate av_fifo_peek(). +2011-08-26 - lavu 51.9.0 + - add41de..abc78a5 Do not include intfloat_readwrite.h, + mathematics.h, rational.h, pixfmt.h, or log.h from avutil.h. + 2011-08-16 - 48f9e45 - lavf 53.8.0 Add avformat_query_codec(). diff --git a/doc/avconv.texi b/doc/avconv.texi index e6ebe71d9d..85c1457621 100644 --- a/doc/avconv.texi +++ b/doc/avconv.texi @@ -749,15 +749,15 @@ Thread count. Video sync method. @table @option -@item 0 +@item passthrough Each frame is passed with its timestamp from the demuxer to the muxer. -@item 1 +@item cfr Frames will be duplicated and dropped to achieve exactly the requested constant framerate. -@item 2 +@item vfr Frames are passed through with their timestamp or dropped so as to prevent 2 frames from having the same timestamp. -@item -1 +@item auto Chooses between 1 and 2 depending on muxer capabilities. This is the default method. @end table diff --git a/doc/general.texi b/doc/general.texi index 1a9e6cbe0b..2f18e4c126 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -134,7 +134,7 @@ library: @item Brute Force & Ignorance @tab @tab X @tab Used in the game Flash Traffic: City of Angels. @item BWF @tab X @tab X -@item CRI ADX @tab @tab X +@item CRI ADX @tab X @tab X @tab Audio-only format used in console video games. @item Discworld II BMV @tab @tab X @item Interplay C93 @tab @tab X diff --git a/doc/indevs.texi b/doc/indevs.texi index 038d253da0..3b2c86290c 100644 --- a/doc/indevs.texi +++ b/doc/indevs.texi @@ -515,9 +515,9 @@ kind @file{/dev/video@var{N}}, where @var{N} is a number associated to the device. Video4Linux and Video4Linux2 devices only support a limited set of -@var{width}x@var{height} sizes and frame rates. You can check which are +@var{width}x@var{height} sizes and framerates. You can check which are supported for example with the command @command{dov4l} for Video4Linux -devices and the command @command{v4l-info} for Video4Linux2 devices. +devices and using @command{-list_formats all} for Video4Linux2 devices. If the size for the device is set to 0x0, the input device will try to auto-detect the size to use. |