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/faq.texi | |
| parent | c225615bf2da206775c5ff2b56d648cf50d38756 (diff) | |
| parent | b1ac139d89b9fc55b70ad3411af2f75fe8b17805 (diff) | |
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/faq.texi')
| -rw-r--r-- | doc/faq.texi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/faq.texi b/doc/faq.texi index 76e8c7591a..225f139b3c 100644 --- a/doc/faq.texi +++ b/doc/faq.texi @@ -280,7 +280,7 @@ Just create an "input.avs" text file with this single line ... @example DirectShowSource("C:\path to your file\yourfile.asf") @end example -... and then feed that text file to FFmpeg: +... and then feed that text file to ffmpeg: @example ffmpeg -i input.avs @end example @@ -348,7 +348,7 @@ ffmpeg -f u16le -acodec pcm_s16le -ac 2 -ar 44100 -i all.a \ rm temp[12].[av] all.[av] @end example -@section FFmpeg does not adhere to the -maxrate setting, some frames are bigger than maxrate/fps. +@section The ffmpeg program does not respect the -maxrate setting, some frames are bigger than maxrate/fps. Read the MPEG spec about video buffer verifier. |