[FFmpeg-cvslog] r20553 - in trunk: cmdutils.c cmdutils.h ffmpeg.c ffplay.c ffserver.c

[Daniel Verkamp]

On Thu, Nov 19, 2009 at 10:35 AM, michael <subversion at mplayerhq.hu> wrote:
> Author: michael
> Date: Thu Nov 19 17:35:55 2009
> New Revision: 20553
>
> Log:
> Split show_formats().
[...]

Possible patch to docs and Changelog for this change attached.

Thanks,
-- Daniel Verkamp
-------------- next part --------------
>From 2ee2e3c2608d790d2940034169a3193cefa69c06 Mon Sep 17 00:00:00 2001
From: Daniel Verkamp <daniel at drv.nu>
Date: Fri, 20 Nov 2009 03:24:50 -0500
Subject: [PATCH] Document -formats split

---
 Changelog             |    1 +
 doc/ffmpeg-doc.texi   |   23 ++++++++++++++++++++---
 doc/ffplay-doc.texi   |    8 +++++++-
 doc/ffserver-doc.texi |    8 +++++++-
 doc/general.texi      |    2 +-
 5 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/Changelog b/Changelog
index 7821e72..9bea64f 100644
--- a/Changelog
+++ b/Changelog
@@ -42,6 +42,7 @@ version <next>:
 - MD STUDIO audio demuxer
 - RF64 support in WAV demuxer
 - MPEG-4 Audio Lossless Coding (ALS) decoder
+- -formats option split into -formats, -codecs, -bsfs, and -protocols
 
 
 
diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index b6706f4..98c710a 100644
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -235,9 +235,20 @@ Show help.
 Show version.
 
 @item -formats
-Show available formats, codecs, bitstream filters, protocols, and frame size and frame rate abbreviations.
+Show available formats.
 
-The fields preceding the format and codec names have the following meanings:
+The fields preceding the format names have the following meanings:
+ at table @samp
+ at item D
+Decoding available
+ at item E
+Encoding available
+ at end table
+
+ at item -codecs
+Show available codecs.
+
+The fields preceding the codec names have the following meanings:
 @table @samp
 @item D
 Decoding available
@@ -253,6 +264,12 @@ Codec supports direct rendering
 Codec can handle input truncated at random locations instead of only at frame boundaries
 @end table
 
+ at item -bsfs
+Show available bitstream filters.
+
+ at item -protocols
+Show available protocols.
+
 @item -f @var{fmt}
 Force format.
 
@@ -933,7 +950,7 @@ to standard output.
 
 FFmpeg also handles many protocols specified with an URL syntax.
 
-Use 'ffmpeg -formats' to see a list of the supported protocols.
+Use 'ffmpeg -protocols' to see a list of the supported protocols.
 
 The protocol @code{http:} is currently used only to communicate with
 FFserver (see the FFserver documentation). When FFmpeg will be a
diff --git a/doc/ffplay-doc.texi b/doc/ffplay-doc.texi
index a920396..4e06a9c 100644
--- a/doc/ffplay-doc.texi
+++ b/doc/ffplay-doc.texi
@@ -36,7 +36,13 @@ Show version.
 @item -L
 Show license.
 @item -formats
-Show available formats, codecs, protocols, ...
+Show available formats.
+ at item -codecs
+Show available codecs.
+ at item -bsfs
+Show available bitstream filters.
+ at item -protocols
+Show available protocols.
 @item -x @var{width}
 Force displayed width.
 @item -y @var{height}
diff --git a/doc/ffserver-doc.texi b/doc/ffserver-doc.texi
index 0feface..1a635da 100644
--- a/doc/ffserver-doc.texi
+++ b/doc/ffserver-doc.texi
@@ -242,7 +242,13 @@ Show version.
 @item -L
 Show license.
 @item -formats
-Show available formats, codecs, protocols, ...
+Show available formats.
+ at item -codecs
+Show available codecs.
+ at item -bsfs
+Show available bitstream filters.
+ at item -protocols
+Show available protocols.
 @item -h
 Show help.
 @item -loglevel @var{loglevel}
diff --git a/doc/general.texi b/doc/general.texi
index d5f39f3..3afbc87 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -32,7 +32,7 @@ GPL components, GPL version 3) to use it.
 
 @chapter Supported File Formats and Codecs
 
-You can use the @code{-formats} option to have an exhaustive list.
+You can use the @code{-formats} and @code{-codecs} options to have an exhaustive list.
 
 @section File Formats
 
-- 
1.6.5.2