[xiph-commits] r14151 - trunk/theora-exp/examples

[tterribe at svn.xiph.org]

Author: tterribe
Date: 2007-11-15 06:21:36 -0800 (Thu, 15 Nov 2007)
New Revision: 14151

Modified:
   trunk/theora-exp/examples/dump_video.c
Log:
Merge r13910 from mainline and fix extraneous FRAME output in raw mode.


Modified: trunk/theora-exp/examples/dump_video.c
===================================================================
--- trunk/theora-exp/examples/dump_video.c	2007-11-15 13:50:21 UTC (rev 14150)
+++ trunk/theora-exp/examples/dump_video.c	2007-11-15 14:21:36 UTC (rev 14151)
@@ -150,7 +150,7 @@
   /*Uncomment the following to do normal, non-striped decoding.
   th_ycbcr_buffer ycbcr;
   th_decode_ycbcr_out(td,ycbcr);*/
-  fprintf(outfile, "FRAME\n");
+  if(!raw)fprintf(outfile, "FRAME\n");
 
   for(pli=0;pli<3;pli++){
     for(i=0;i<ycbcr[pli].height;i++){
@@ -204,7 +204,7 @@
   while((c=getopt_long(argc,argv,optstring,options,&long_option_index))!=EOF){
     switch(c){
     case 'o':
-      if(!strcmp(optarg,"-")){
+      if(strcmp(optarg,"-")!=0){
         outfile=fopen(optarg,"wb");
         if(outfile==NULL){
           fprintf(stderr,"Unable to open output file '%s'\n", optarg);