[FFmpeg-devel] [PATCH 3/3 v2] Documentation: update decklink options

[Matthias Hunstock]

Signed-off-by: Matthias Hunstock <atze at fem.tu-ilmenau.de>
---
 doc/indevs.texi  | 14 ++++++++++----
 doc/outdevs.texi | 15 +++++++++++++++
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/doc/indevs.texi b/doc/indevs.texi
index 27cc3d5..a4c99a9 100644
--- a/doc/indevs.texi
+++ b/doc/indevs.texi
@@ -233,6 +233,12 @@ Defaults to @option{false}.
 If set to @option{true}, print a list of supported formats and exit.
 Defaults to @option{false}.
 
+ at item format_code <FourCC>
+This sets the input video format to the format given by the FourCC. To see
+the supported values of your device(s) use @option{list_formats}.
+Note that there is a fourCC @option{'pal '} that can also be used
+as @option{pal} (3 letters).
+
 @item bm_v210
 If set to @samp{1}, video is captured in 10 bit v210 instead
 of uyvy422. Not all Blackmagic devices support this option.
@@ -296,21 +302,21 @@ ffmpeg -f decklink -list_formats 1 -i 'Intensity Pro'
 @end example
 
 @item
-Capture video clip at 1080i50 (format 11):
+Capture video clip at 1080i50:
 @example
-ffmpeg -f decklink -i 'Intensity Pro@@11' -acodec copy -vcodec copy output.avi
+ffmpeg -format_code Hi50 -f decklink -i 'Intensity Pro' -acodec copy -vcodec copy output.avi
 @end example
 
 @item
 Capture video clip at 1080i50 10 bit:
 @example
-ffmpeg -bm_v210 1 -f decklink -i 'UltraStudio Mini Recorder@@11' -acodec copy -vcodec copy output.avi
+ffmpeg -bm_v210 1 -format_code Hi50 -f decklink -i 'UltraStudio Mini Recorder' -acodec copy -vcodec copy output.avi
 @end example
 
 @item
 Capture video clip at 1080i50 with 16 audio channels:
 @example
-ffmpeg -channels 16 -f decklink -i 'UltraStudio Mini Recorder@@11' -acodec copy -vcodec copy output.avi
+ffmpeg -channels 16 -format_code Hi50 -f decklink -i 'UltraStudio Mini Recorder' -acodec copy -vcodec copy output.avi
 @end example
 
 @end itemize
diff --git a/doc/outdevs.texi b/doc/outdevs.texi
index df41cc8..40206a4 100644
--- a/doc/outdevs.texi
+++ b/doc/outdevs.texi
@@ -146,6 +146,15 @@ Defaults to @option{false}.
 If set to @option{true}, print a list of supported formats and exit.
 Defaults to @option{false}.
 
+ at item format_code <FourCC>
+This sets the output video format to the format given by the FourCC. To see
+the supported values of your device(s) use @option{list_formats}.
+Note that there is a fourCC @option{'pal '} that can also be used
+as @option{pal} (3 letters).
+
+Without this option the correct output video format is chosen automatically.
+Use this option only to enforce a specific output format in special use cases.
+
 @item preroll
 Amount of time to preroll video in seconds.
 Defaults to @option{0.5}.
@@ -180,6 +189,12 @@ Play video clip with non-standard framerate or video size:
 ffmpeg -i test.avi -f decklink -pix_fmt uyvy422 -s 720x486 -r 24000/1001 'DeckLink Mini Monitor'
 @end example
 
+ at item
+Play video clip, enforce interlaced playout of progressive video
+ at example
+ffmpeg -i test.avi -f decklink -pix_fmt uyvy422 -field_order tt 'DeckLink Mini Monitor'
+ at end example
+
 @end itemize
 
 @section fbdev
-- 
2.1.4