From 39a4f14643804bd11debad73ca45ed0d4cbf011d Mon Sep 17 00:00:00 2001
From: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Date: Sat, 27 Jun 2009 13:26:35 +0000
Subject: Update ffmpeg documentation regarding metadata setting. -title,
 -author, -copyright, -track, -album, and -year options have been dropped in
 favor of -metadata.

Originally committed as revision 19285 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 doc/ffmpeg-doc.texi | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

(limited to 'doc')

diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index b68b130bc2..182b2146bf 100644
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -282,29 +282,15 @@ The offset is added to the timestamps of the input files.
 Specifying a positive offset means that the corresponding
 streams are delayed by 'offset' seconds.
 
-@item -title @var{string}
-Set the title.
-
 @item -timestamp @var{time}
 Set the timestamp.
 
-@item -author @var{string}
-Set the author.
-
-@item -copyright @var{string}
-Set the copyright.
-
-@item -comment @var{string}
-Set the comment.
-
-@item -album @var{string}
-Set the album.
+@item -metadata @var{key}=@var{value}
+Set a metadata key/par value.
 
-@item -track @var{number}
-Set the track.
-
-@item -year @var{number}
-Set the year.
+@example
+ffmpeg -i in.avi -metadata title="my title"
+@end example
 
 @item -v @var{number}
 Set the logging verbosity level.
-- 
cgit v1.2.3