[xiph-commits] r13414 - trunk/ffmpeg2theora

[j at svn.xiph.org]

Author: j
Date: 2007-07-31 06:13:50 -0700 (Tue, 31 Jul 2007)
New Revision: 13414

Modified:
   trunk/ffmpeg2theora/ffmpeg2theora.1
   trunk/ffmpeg2theora/ffmpeg2theora.c
   trunk/ffmpeg2theora/theorautils.c
Log:
- manpage patch from Sikon that fixes the Lintian warning about improper use of the hyphen (-) and minus sign (\-) in the manpage.
- add examples to man page
- add example on how to input frames



Modified: trunk/ffmpeg2theora/ffmpeg2theora.1
===================================================================
--- trunk/ffmpeg2theora/ffmpeg2theora.1	2007-07-31 05:39:25 UTC (rev 13413)
+++ trunk/ffmpeg2theora/ffmpeg2theora.1	2007-07-31 13:13:50 UTC (rev 13414)
@@ -44,7 +44,7 @@
 .TP
 .B \-p, \-\-v2v-preset
 Encode file with v2v preset.  Right now, there is preview and pro.  Run
-\*(lqffmpeg2theora -p info\*(rq for more information.
+\*(lqffmpeg2theora \-p info\*(rq for more information.
 .SS Video output options:
 .TP
 .B \-v, \-\-videoquality
@@ -121,14 +121,14 @@
 .TP
 .B \-\-vhook
 you can use ffmpeg's vhook system, example:
- ffmpeg2theora --vhook '/path/watermark.so -f wm.gif' input.dv
+ ffmpeg2theora \-\-vhook '/path/watermark.so \-f wm.gif' input.dv
 .TP
 .B \-f, \-\-format
 Specify input format.
 .TP
 .B \-\-v4l  /dev/video0
 read data from v4l device /dev/video0,
-you have to specify an output file with -o.
+you have to specify an output file with \-o.
 .TP
 .B \-\-inputfps
 Override input fps.
@@ -170,6 +170,28 @@
 .TP
 .B \-h, \-\-help
 Output a help message.
+.SH EXAMPLES
+Encode Videos:
+  ffmpeg2theora videoclip.avi (will write output to videoclip.ogg)
+  
+  cat something.dv | ffmpeg2theora -f dv -o output.ogg \-
+
+Encode a series of images:
+  ffmpeg2theora -f image2 frame%06d.png -o output.ogg
+
+Live streaming from V4L Device:
+  ffmpeg2theora \-\-v4l /dev/video0 \-\-inputfps 15 \-x 160 \-y 128 \-o \- \\
+    | oggfwd iccast2server 8000 password /theora.ogg
+
+Live encoding from a DV camcorder (needs a fast machine):
+  dvgrab - | ffmpeg2theora -f dv -x 352 -y 288 -o output.ogg -\n"
+
+Live encoding and streaming to icecast server:
+  dvgrab \-\-format raw \- \\
+    | ffmpeg2theora \-f dv \-x 160 \-y 128 \-o /dev/stdout \- \\
+    | oggfwd iccast2server 8000 password /theora.ogg
+
+
 .SH AUTHOR
 ffmpeg2theora was written by jan gerber <j at v2v.cc>.
 .PP

Modified: trunk/ffmpeg2theora/ffmpeg2theora.c
===================================================================
--- trunk/ffmpeg2theora/ffmpeg2theora.c	2007-07-31 05:39:25 UTC (rev 13413)
+++ trunk/ffmpeg2theora/ffmpeg2theora.c	2007-07-31 13:13:50 UTC (rev 13414)
@@ -760,7 +760,7 @@
                         if (uv_lut_used) {
                             lut_apply(uv_lut, yuv.u, yuv.u, yuv.uv_width, yuv.uv_height, yuv.uv_stride);
                             lut_apply(uv_lut, yuv.v, yuv.v, yuv.uv_width, yuv.uv_height, yuv.uv_stride);
-			  }
+                        }
                         oggmux_add_video(&info, &yuv ,e_o_s);
                         this->frame_count++;
                     } while(dups--);
@@ -1030,19 +1030,22 @@
         "\n"
         "  cat something.dv | ffmpeg2theora -f dv -o output.ogg -\n"
         "\n"
+        "  Encode a series of images:\n"
+        "    ffmpeg2theora -f image2 frame\%06d.png -o output.ogg\n"
+        "\n"
 #ifdef VIDEO4LINUX_ENABLED
         "  Live streaming from V4L Device:\n"
-        "  ffmpeg2theora --v4l /dev/video0 --inputfps 15 -x 160 -y 128 -o - \\\n"
-        "   | oggfwd iccast2server 8000 password /theora.ogg\n"
+        "    ffmpeg2theora --v4l /dev/video0 --inputfps 15 -x 160 -y 128 -o - \\\n"
+        "     | oggfwd iccast2server 8000 password /theora.ogg\n"
         "\n"
 #endif
         "  Live encoding from a DV camcorder (needs a fast machine):\n"
-        "  dvgrab - | ffmpeg2theora -f dv -x 352 -y 288 -o output.ogg -\n"
+        "    dvgrab - | ffmpeg2theora -f dv -x 352 -y 288 -o output.ogg -\n"
         "\n"
         "  Live encoding and streaming to icecast server:\n"
-        "  dvgrab --format raw - | \\\n"
-        "   ffmpeg2theora -f dv -x 160 -y 128 -o /dev/stdout - | \\\n"
-        "   oggfwd iccast2server 8000 password /theora.ogg\n"
+        "    dvgrab --format raw - \\\n"
+        "     | ffmpeg2theora -f dv -x 160 -y 128 -o /dev/stdout - \\\n"
+        "     | oggfwd iccast2server 8000 password /theora.ogg\n"
         "\n"
         );
     exit (0);

Modified: trunk/ffmpeg2theora/theorautils.c
===================================================================
--- trunk/ffmpeg2theora/theorautils.c	2007-07-31 05:39:25 UTC (rev 13413)
+++ trunk/ffmpeg2theora/theorautils.c	2007-07-31 13:13:50 UTC (rev 13414)
@@ -334,7 +334,6 @@
  */
 void oggmux_add_video (oggmux_info *info, yuv_buffer *yuv, int e_o_s){
     ogg_packet op;
-
     theora_encode_YUVin (&info->td, yuv);
     while(theora_encode_packetout (&info->td, e_o_s, &op)) {
       ogg_stream_packetin (&info->to, &op);