diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-24 03:38:03 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-24 03:41:22 +0200 |
commit | 7b376b398a464a5825ede8b10d5f605c526c7399 (patch) | |
tree | e254c50f44e8befc83e4dde353ff3cd6189f2061 /doc/ffprobe.texi | |
parent | c225615bf2da206775c5ff2b56d648cf50d38756 (diff) | |
parent | b1ac139d89b9fc55b70ad3411af2f75fe8b17805 (diff) | |
download | ffmpeg-streaming-7b376b398a464a5825ede8b10d5f605c526c7399.zip ffmpeg-streaming-7b376b398a464a5825ede8b10d5f605c526c7399.tar.gz |
Merge remote branch 'qatar/master'
* qatar/master:
Handle unicode file names on windows
rtp: Rename the open/close functions to alloc/free
Lowercase all ff* program names.
Refer to ff* tools by their lowercase names.
NOT Pulled Replace more FFmpeg instances by Libav or ffmpeg.
Replace `` by $() syntax in shell scripts.
patcheck: Allow overiding grep program(s) through environment variables.
NOT Pulled Remove stray libavcore and _g binary references.
vorbis: Rename decoder/encoder files to follow general file naming scheme.
aacenc: Fix whitespace after last commit.
cook: Fix small typo in av_log_ask_for_sample message.
aacenc: Finish 3GPP psymodel analysis for non mid/side cases.
Remove RDFT dependency from AAC decoder.
Add some debug log messages to AAC extradata
Fix mov debug (u)int64_t format strings.
bswap: use native types for av_bwap16().
doc: FLV muxing is supported.
applehttp: Handle AES-128 encrypted streams
Add a protocol handler for AES CBC decryption with PKCS7 padding
doc: Mention that DragonFly BSD requires __BSD_VISIBLE set
Conflicts:
ffplay.c
ffprobe.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/ffprobe.texi')
-rw-r--r-- | doc/ffprobe.texi | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/ffprobe.texi b/doc/ffprobe.texi index de65eee..15e7764 100644 --- a/doc/ffprobe.texi +++ b/doc/ffprobe.texi @@ -1,8 +1,8 @@ \input texinfo @c -*- texinfo -*- -@settitle FFprobe Documentation +@settitle ffprobe Documentation @titlepage -@center @titlefont{FFprobe Documentation} +@center @titlefont{ffprobe Documentation} @end titlepage @top @@ -22,7 +22,7 @@ ffprobe [options] [@file{input_file}] @chapter Description @c man begin DESCRIPTION -FFprobe gathers information from multimedia streams and prints it in +ffprobe gathers information from multimedia streams and prints it in human- and machine-readable fashion. For example it can be used to check the format of the container used @@ -33,7 +33,7 @@ If a filename is specified in input, ffprobe will try to open and probe the file content. If the file cannot be opened or recognized as a multimedia file, a positive exit code is returned. -FFprobe may be employed both as a standalone application or in +ffprobe may be employed both as a standalone application or in combination with a textual filter, which may perform more sophisticated processing, e.g. statistical processing or plotting. @@ -41,7 +41,7 @@ Options are used to list some of the formats supported by ffprobe or for specifying which information to display, and for setting how ffprobe will show it. -FFprobe output is designed to be easily parsable by a textual filter, +ffprobe output is designed to be easily parsable by a textual filter, and consists of one or more sections of the form: @example [SECTION] @@ -119,7 +119,7 @@ with name "STREAM". @ignore @setfilename ffprobe -@settitle FFprobe media prober +@settitle ffprobe media prober @c man begin SEEALSO ffmpeg(1), ffplay(1), ffserver(1) and the FFmpeg HTML documentation |