Release versions 1.2.11 and 1.2.11-1

[videolink.git] / README

diff --git a/README b/README
index ddee1897e5c5e043557bb559da1c4debb38b49f2..e2beea2d496acf24c97bc48dd052da9733e8f154 100644 (file)
--- a/README
+++ b/README
@@ -18,14 +18,20 @@ VideoLink depends on the following software:
 - dvdauthor
 - expat 1.x
 - Gtkmm 2.4 or later
 - dvdauthor
 - expat 1.x
 - Gtkmm 2.4 or later

-- ffmpeg or mjpegtools 1.8 or later
-- Mozilla 1.8 or later, or XULRunner
-- netpbm
+- either of:
+  - ffmpeg including mpeg2video encoding
+    ("ffmpeg -formats" should show "DEVSDT mpeg2video" in the codecs section)
+  - both of:
+    - mjpegtools 1.8 or later
+    - netpbm
+- Mozilla 1.8 or later, or XULRunner 1.9 or later

 - Xvfb (from XFree86 or X.org)
 
 To build a complete DVD image you will also need:
 
 - Xvfb (from XFree86 or X.org)
 
 To build a complete DVD image you will also need:
 

-- mkisofs
+- either of:
+  - genisoimage (from cdrkit)
+  - mkisofs (from cdrtools)

 
 You will also need a program for producing DVD-suitable MPEG-1 or
 MPEG-2 video files.
 
 You will also need a program for producing DVD-suitable MPEG-1 or
 MPEG-2 video files.


@@ -42,10 +48,10 @@ below.
 Linking to video
 
 You can link directly to local MPEG video files whose names end in
 Linking to video
 
 You can link directly to local MPEG video files whose names end in

-".mpeg", ".mpeg2" or ".vob".  If you wish to combine multiple files
-into a single video sequence ("title" in DVD terminology) or to add
-chapter marks to a video sequence, create and link to a VOB-list file
-(explained below) whose name ends in ".voblist".
+".mpeg", ".mpeg2", ".mpg" or ".vob".  If you wish to combine multiple
+files into a single video sequence ("title" in DVD terminology) or to
+add chapter marks to a video sequence, create and link to a VOB-list
+file (explained below) whose name ends in ".voblist".

 
 VOB-lists
 
 
 VOB-lists
 


@@ -198,7 +204,7 @@ Author and copyright
 --------------------
 
 VideoLink was written by Ben Hutchings <ben@decadent.org.uk>.
 --------------------
 
 VideoLink was written by Ben Hutchings <ben@decadent.org.uk>.

-Copyright 2005-2006 Ben Hutchings.
+Copyright 2005-2008 Ben Hutchings.

 
 This software is based in part on the work of the Independent JPEG Group.
 Copyright 1991-1998 Thomas G. Lane.  (This applies to the file jquant2.c.)
 
 This software is based in part on the work of the Independent JPEG Group.
 Copyright 1991-1998 Thomas G. Lane.  (This applies to the file jquant2.c.)