[xiph-commits] r9793 - trunk/theora/examples

[giles at svn.xiph.org]

Author: giles
Date: 2005-08-20 12:13:54 -0700 (Sat, 20 Aug 2005)
New Revision: 9793

Modified:
   trunk/theora/examples/dump_video.c
Log:
Don't take an argument for the -r/--raw option in dump_video. I'm not 
sure why it was done this way; we can make an argument optional later
if we want to add more than one "raw" output format.


Modified: trunk/theora/examples/dump_video.c
===================================================================
--- trunk/theora/examples/dump_video.c	2005-08-20 18:46:37 UTC (rev 9792)
+++ trunk/theora/examples/dump_video.c	2005-08-20 19:13:54 UTC (rev 9793)
@@ -47,10 +47,10 @@
 
 
 
-const char *optstring = "or:";
+const char *optstring = "o:r";
 struct option options [] = {
   {"output",required_argument,NULL,'o'},
-  {"raw",required_argument, NULL, 'r'}, /* Disable YUV4MPEG2 headers if set */
+  {"raw",no_argument, NULL, 'r'}, /* Disable YUV4MPEG2 headers if set */
   {NULL,0,NULL,0}
 };
 
@@ -177,12 +177,9 @@
         exit(1);
       }
       break;
-      case 'r':
-      if(sscanf(optarg, "%u", &raw) != 1) {
-          fprintf(stderr, "Invalid option, assuming YUV4MPEG4 output\n");
-          raw = 0;
-      }
 
+      case 'r':
+      raw = 1;
       break;
 
       default:
@@ -297,7 +294,8 @@
   if(theora_p){
     theora_decode_init(&td,&ti);
     fprintf(stderr,"Ogg logical stream %x is Theora %dx%d %.02f fps video\nEncoded frame content is %dx%d with %dx%d offset\n",
-            to.serialno,ti.width,ti.height, (double)ti.fps_numerator/ti.fps_denominator,
+            (unsigned int)to.serialno,ti.width,ti.height, 
+	    (double)ti.fps_numerator/ti.fps_denominator,
             ti.frame_width, ti.frame_height, ti.offset_x, ti.offset_y);
   }else{
     /* tear down the partial theora setup */
@@ -362,7 +360,7 @@
 
     if(!videobuf_ready){
       /* no data yet for somebody.  Grab another page */
-      int ret=buffer_data(infile,&oy);
+      buffer_data(infile,&oy);
       while(ogg_sync_pageout(&oy,&og)>0){
         queue_page(&og);
       }