[FFmpeg-cvslog] r21858 - in branches/0.5: . doc/ffmpeg-doc.texi

[siretart]

Author: siretart
Date: Wed Feb 17 00:04:10 2010
New Revision: 21858

Log:
misc. manpage updates, fixes LP: #501729, Debian: #570050

Update ffmpeg documentation regarding metadata setting. -title,
-author, -copyright, -track, -album, and -year options have been
dropped in favor of -metadata.
Add an explanation and complete the metadata usage example.

backported revisions r19285, r19287 and r19320 by stefano.

Modified:
   branches/0.5/   (props changed)
   branches/0.5/doc/ffmpeg-doc.texi

Modified: branches/0.5/doc/ffmpeg-doc.texi
==============================================================================
--- branches/0.5/doc/ffmpeg-doc.texi	Wed Feb 17 00:00:03 2010	(r21857)
+++ branches/0.5/doc/ffmpeg-doc.texi	Wed Feb 17 00:04:10 2010	(r21858)
@@ -141,8 +141,9 @@ to get the desired audio language.
 
 NOTE: To see the supported input formats, use @code{ffmpeg -formats}.
 
-* You can extract images from a video:
+* You can extract images from a video, or create a video from many images:
 
+For extracting images from a video:
 @example
 ffmpeg -i foo.avi -r 1 -s WxH -f image2 foo-%03d.jpeg
 @end example
@@ -151,15 +152,20 @@ This will extract one video frame per se
 output them in files named @file{foo-001.jpeg}, @file{foo-002.jpeg},
 etc. Images will be rescaled to fit the new WxH values.
 
+If you want to extract just a limited number of frames, you can use the
+above command in combination with the -vframes or -t option, or in
+combination with -ss to start extracting from a certain point in time.
+
+For creating a video from many images:
+ at example
+ffmpeg -f image2 -i foo-%03d.jpeg -r 12 -s WxH foo.avi
+ at end example
+
 The syntax @code{foo-%03d.jpeg} specifies to use a decimal number
 composed of three digits padded with zeroes to express the sequence
 number. It is the same syntax supported by the C printf function, but
 only formats accepting a normal integer are suitable.
 
-If you want to extract just a limited number of frames, you can use the
-above command in combination with the -vframes or -t option, or in
-combination with -ss to start extracting from a certain point in time.
-
 * You can put many streams of the same type in the output:
 
 @example
@@ -276,29 +282,16 @@ The offset is added to the timestamps of
 Specifying a positive offset means that the corresponding
 streams are delayed by 'offset' seconds.
 
- at item -title @var{string}
-Set the title.
-
 @item -timestamp @var{time}
 Set the timestamp.
 
- at item -author @var{string}
-Set the author.
-
- at item -copyright @var{string}
-Set the copyright.
-
- at item -comment @var{string}
-Set the comment.
-
- at item -album @var{string}
-Set the album.
-
- at item -track @var{number}
-Set the track.
+ at item -metadata @var{key}=@var{value}
+Set a metadata key/value pair.
 
- at item -year @var{number}
-Set the year.
+For example, for setting the title in the output file:
+ at example
+ffmpeg -i in.avi -metadata title="my title" out.flv
+ at end example
 
 @item -v @var{number}
 Set the logging verbosity level.
@@ -687,6 +680,8 @@ Set the number of audio frames to record
 Set the audio sampling frequency (default = 44100 Hz).
 @item -ab @var{bitrate}
 Set the audio bitrate in bit/s (default = 64k).
+ at item -aq @var{q}
+Set the audio quality (codec-specific, VBR).
 @item -ac @var{channels}
 Set the number of audio channels (default = 1).
 @item -an
@@ -728,6 +723,8 @@ Force subtitle codec ('copy' to copy str
 Add a new subtitle stream to the current output stream.
 @item -slang @var{code}
 Set the ISO 639 language code (3 letters) of the current subtitle stream.
+ at item -sn
+Disable subtitle recording.
 @item -sbsf @var{bitstream_filter}
 Bitstream filters available are "mov2textsub", "text2movsub".
 @example