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

[j at svn.xiph.org]

Author: j
Date: 2011-07-16 09:10:49 -0700 (Sat, 16 Jul 2011)
New Revision: 18032

Modified:
   trunk/ffmpeg2theora/src/ffmpeg2theora.c
Log:
less output in frontend mode

Modified: trunk/ffmpeg2theora/src/ffmpeg2theora.c
===================================================================
--- trunk/ffmpeg2theora/src/ffmpeg2theora.c	2011-07-13 20:28:34 UTC (rev 18031)
+++ trunk/ffmpeg2theora/src/ffmpeg2theora.c	2011-07-16 16:10:49 UTC (rev 18032)
@@ -2898,23 +2898,24 @@
                     if (info.twopass!=3 || info.passno==1) {
                         av_dump_format(convert->context, 0,inputfile_name, 0);
                     }
+                    if (convert->disable_audio) {
+                        fprintf(stderr, "  [audio disabled].\n");
+                    }
+                    if (convert->disable_video) {
+                        fprintf(stderr, "  [video disabled].\n");
+                    }
+                    if (!convert->included_subtitles) {
+                        fprintf(stderr, "  [subtitles disabled].\n");
+                    }
                 }
-                if (convert->disable_audio) {
-                    fprintf(stderr, "  [audio disabled].\n");
-                }
-                if (convert->disable_video) {
-                    fprintf(stderr, "  [video disabled].\n");
-                }
-                if (!convert->included_subtitles) {
-                    fprintf(stderr, "  [subtitles disabled].\n");
-                }
                 if (convert->disable_metadata) {
-                    fprintf(stderr, "  [metadata disabled].\n");
+                    if (!info.frontend)
+                        fprintf(stderr, "  [metadata disabled].\n");
                 } else {
                     copy_metadata(convert->context);
                 }
 
-                if (!convert->sync) {
+                if (!convert->sync && !info.frontend) {
                     fprintf(stderr, "  Ignore A/V Sync from input container.\n");
                 }
 
@@ -2967,9 +2968,11 @@
     if (info.twopass_file)
         fclose(info.twopass_file);
 
-    if (info.frontend)
+    if (info.frontend) {
         fprintf(info.frontend, "{\"result\": \"ok\"}\n");
-    if (info.frontend && info.frontend != stderr)
+        fflush(info.frontend);
+    }
+    if (info.frontend && info.frontend != stdout)
         fclose(info.frontend);
 #ifdef WIN32
     if (info.twopass==3)