diff options
| author | root <root@muzej.(none)> | 2011-11-29 17:50:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-29 18:25:43 +0100 |
| commit | b0a90c20041b1fc8e5cd2671c6ca59ec4b1a60df (patch) | |
| tree | 437490cb6ed431ae8a1b6c12d10814f0f0161009 | |
| parent | aadbf9f74c39202c74aba4e220ed27cb3cedb8a4 (diff) | |
| download | ffmpeg-b0a90c20041b1fc8e5cd2671c6ca59ec4b1a60df.tar.gz | |
faq.texi: fix spelling errors
credits to: Philip (from Google Code-in)
Signed-off-by: burek <burek021@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | doc/faq.texi | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/faq.texi b/doc/faq.texi index 7ea0c8d857..dccde2d6f7 100644 --- a/doc/faq.texi +++ b/doc/faq.texi @@ -202,9 +202,9 @@ Use @file{-} as file name. Try '-f image2 test%d.jpg'. -@section Why can I not change the framerate? +@section Why can I not change the frame rate? -Some codecs, like MPEG-1/2, only allow a small number of fixed framerates. +Some codecs, like MPEG-1/2, only allow a small number of fixed frame rates. Choose a different codec with the -vcodec command line option. @section How do I encode Xvid or DivX video with ffmpeg? @@ -430,7 +430,7 @@ you need the debug information, use the *_g versions. @section I do not like the LGPL, can I contribute code under the GPL instead? Yes, as long as the code is optional and can easily and cleanly be placed -under #if CONFIG_GPL without breaking anything. So for example a new codec +under #if CONFIG_GPL without breaking anything. So, for example, a new codec or filter would be OK under GPL while a bug fix to LGPL code would not. @section I want to compile xyz.c alone but my compiler produced many errors. @@ -481,9 +481,9 @@ Even if peculiar since it is network oriented, RTP is a container like any other. You have to @emph{demux} RTP before feeding the payload to libavcodec. In this specific case please look at RFC 4629 to see how it should be done. -@section AVStream.r_frame_rate is wrong, it is much larger than the framerate. +@section AVStream.r_frame_rate is wrong, it is much larger than the frame rate. -r_frame_rate is NOT the average framerate, it is the smallest framerate +r_frame_rate is NOT the average frame rate, it is the smallest frame rate that can accurately represent all timestamps. So no, it is not wrong if it is larger than the average! For example, if you have mixed 25 and 30 fps content, then r_frame_rate |