[xiph-commits] r12090 - trunk/ffmpeg2theora

[j at svn.xiph.org]

Author: j
Date: 2006-11-12 02:57:46 -0800 (Sun, 12 Nov 2006)
New Revision: 12090

Modified:
   trunk/ffmpeg2theora/ChangeLog
   trunk/ffmpeg2theora/ffmpeg2theora.c
Log:
update changelog; move -F to output options

Modified: trunk/ffmpeg2theora/ChangeLog
===================================================================
--- trunk/ffmpeg2theora/ChangeLog	2006-11-12 10:23:38 UTC (rev 12089)
+++ trunk/ffmpeg2theora/ChangeLog	2006-11-12 10:57:46 UTC (rev 12090)
@@ -1,3 +1,8 @@
+0.17 2006-11-??
+    - new option -F/--framerate to set output framerate
+    - skeleton support(-k)
+    - vhook support(only available if libav* is linked as shared lib)
+    
 0.16  2006-02-11
     - support encoding from .ogg input file.
     - don't change samplerate and audio channels unless we use command

Modified: trunk/ffmpeg2theora/ffmpeg2theora.c
===================================================================
--- trunk/ffmpeg2theora/ffmpeg2theora.c	2006-11-12 10:23:38 UTC (rev 12089)
+++ trunk/ffmpeg2theora/ffmpeg2theora.c	2006-11-12 10:57:46 UTC (rev 12090)
@@ -927,6 +927,7 @@
         "  -x, --width            scale to given width (in pixels)\n"
         "  -y, --height           scale to given height (in pixels)\n"
         "      --aspect           define frame aspect ratio: i.e. 4:3 or 16:9\n"
+        "  -F, --framerate        output framerate e.g 25:2 or 16\n"
         "      --croptop, --cropbottom, --cropleft, --cropright\n"        
         "                         crop input by given pixels before resizing\n"        
         "  -S, --sharpness        [0 to 2] sharpness of images (default: 2).\n"
@@ -954,7 +955,6 @@
         "      --vhook            you can use ffmpeg's vhook system, example:\n"
         "        ffmpeg2theora --vhook '/path/watermark.so -f wm.gif' input.dv\n"
         "  -f, --format           specify input format\n"
-        "  -F, --framerate        output framerate e.g 25:2 or 16\n"
 #ifdef VIDEO4LINUX_ENABLED
         "      --v4l /dev/video0  read data from v4l device /dev/video0\n"
         "                          you have to specifiy an output file with -o\n"