[xiph-commits] r14325 - trunk/ffmpeg2theora

[j at svn.xiph.org]

Author: j
Date: 2007-12-26 22:22:31 -0800 (Wed, 26 Dec 2007)
New Revision: 14325

Modified:
   trunk/ffmpeg2theora/ffmpeg2theora.c
   trunk/ffmpeg2theora/theorautils.c
Log:
enable skeleton by default, add --no-skeleton switch to disable

Modified: trunk/ffmpeg2theora/ffmpeg2theora.c
===================================================================
--- trunk/ffmpeg2theora/ffmpeg2theora.c	2007-12-26 19:44:02 UTC (rev 14324)
+++ trunk/ffmpeg2theora/ffmpeg2theora.c	2007-12-27 06:22:31 UTC (rev 14325)
@@ -64,6 +64,7 @@
   FRONTEND_FLAG,
   SPEEDLEVEL_FLAG,
   PP_FLAG,
+  NOSKELETON
 } F2T_FLAGS;
 
 enum {
@@ -1002,7 +1003,7 @@
         "\n"
         "General output options:\n"
         "  -o, --output           alternative output filename\n"
-        "  -k, --skeleton         outputs ogg skeleton metadata\n"
+        "  -K, --no-skeleton      disables ogg skeleton metadata output\n"
         "  -s, --starttime        start encoding at this time (in sec.)\n"
         "  -e, --endtime          end encoding at this time (in sec.)\n"
         "  -p, --v2v-preset       encode file with v2v preset.\n"
@@ -1118,11 +1119,12 @@
     AVFormatParameters *formatParams = NULL;
     
     int c,long_option_index;
-    const char *optstring = "P:o:kf:F:x:y:v:V:a:A:S:K:d:H:c:G:Z:C:B:p:N:s:e:D:h::";
+    const char *optstring = "P:o:k:f:F:x:y:v:V:a:A:S:K:d:H:c:G:Z:C:B:p:N:s:e:D:h::";
     struct option options [] = {
       {"pid",required_argument,NULL, 'P'},
       {"output",required_argument,NULL,'o'},
       {"skeleton",no_argument,NULL,'k'},
+      {"no-skeleton",no_argument,&flag,NOSKELETON},
       {"format",required_argument,NULL,'f'},
       {"width",required_argument,NULL,'x'},
       {"height",required_argument,NULL,'y'},
@@ -1268,6 +1270,9 @@
                             convert->audiostream = atoi(optarg);
                             flag = -1;
                             break;
+                        case NOSKELETON:
+                            info.with_skeleton=0;
+                            break;
                     }
                 }
 

Modified: trunk/ffmpeg2theora/theorautils.c
===================================================================
--- trunk/ffmpeg2theora/theorautils.c	2007-12-26 19:44:02 UTC (rev 14324)
+++ trunk/ffmpeg2theora/theorautils.c	2007-12-27 06:22:31 UTC (rev 14325)
@@ -42,7 +42,7 @@
 }
 
 void init_info(oggmux_info *info) {
-    info->with_skeleton = 0; /* skeleton is disabled by default	*/
+    info->with_skeleton = 1; /* skeleton is enabled by default	*/
     info->frontend = 0; /*frontend mode*/
     info->videotime =  0;
     info->audiotime = 0;