[xiph-commits] r16356 - trunk/ffmpeg2theora/src

[j at svn.xiph.org]

Author: j
Date: 2009-07-28 14:02:27 -0700 (Tue, 28 Jul 2009)
New Revision: 16356

Modified:
   trunk/ffmpeg2theora/src/ffmpeg2theora.c
   trunk/ffmpeg2theora/src/theorautils.c
Log:
dont close tmpfile in tow-pass mode

Modified: trunk/ffmpeg2theora/src/ffmpeg2theora.c
===================================================================
--- trunk/ffmpeg2theora/src/ffmpeg2theora.c	2009-07-28 20:19:25 UTC (rev 16355)
+++ trunk/ffmpeg2theora/src/ffmpeg2theora.c	2009-07-28 21:02:27 UTC (rev 16356)
@@ -724,18 +724,18 @@
             frame_aspect=(float)(this->aspect_numerator*this->picture_width)/
                                 (this->aspect_denominator*this->picture_height);
         }
-        if (!info.frontend && this->aspect_denominator && frame_aspect) {
+        if (!(info.twopass==3 && info.passno==2) && !info.frontend && this->aspect_denominator && frame_aspect) {
             fprintf(stderr, "  Pixel Aspect Ratio: %.2f/1 ",(float)this->aspect_numerator/this->aspect_denominator);
             fprintf(stderr, "  Frame Aspect Ratio: %.2f/1\n", frame_aspect);
         }
 
-        if (!info.frontend && this->deinterlace==1)
+        if (!(info.twopass==3 && info.passno==2) && !info.frontend && this->deinterlace==1)
             fprintf(stderr, "  Deinterlace: on\n");
 
         if (strcmp(this->pp_mode, "")) {
             ppContext = pp_get_context(display_width, display_height, PP_FORMAT_420);
             ppMode = pp_get_mode_by_name_and_quality(this->pp_mode, PP_QUALITY_MAX);
-            if(!info.frontend)
+            if(!(info.twopass==3 && info.passno==2) && !info.frontend)
                 fprintf(stderr, "  Postprocessing: %s\n", this->pp_mode);
         }
 
@@ -788,7 +788,7 @@
 
         lut_init(this);
     }
-    if (!info.frontend && this->framerate_new.num > 0 && this->fps != (double)this->framerate_new.num / this->framerate_new.den) {
+    if (!(info.twopass==3 && info.passno==2) && !info.frontend && this->framerate_new.num > 0 && this->fps != (double)this->framerate_new.num / this->framerate_new.den) {
         fprintf(stderr, "  Resample Framerate: %0.3f => %0.3f\n",
                         this->fps, (double)this->framerate_new.num / this->framerate_new.den);
     }

Modified: trunk/ffmpeg2theora/src/theorautils.c
===================================================================
--- trunk/ffmpeg2theora/src/theorautils.c	2009-07-28 20:19:25 UTC (rev 16355)
+++ trunk/ffmpeg2theora/src/theorautils.c	2009-07-28 21:02:27 UTC (rev 16356)
@@ -1026,7 +1026,7 @@
 
     if (info->passno!=1 && info->outfile && info->outfile != stdout)
         fclose (info->outfile);
-    if(info->twopass_file)
+    if(info->twopass!=3 && info->twopass_file)
         fclose(info->twopass_file);
 
     if (info->videopage)