[FFmpeg-cvslog] avutil/cpu: output cpu data to stdout

Michael Niedermayer git at videolan.org
Wed Aug 6 02:07:33 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Aug  6 01:16:56 2014 +0200| [9101ef6757e964c64dd1b3c50baccbe6f5e52550] | committer: Michael Niedermayer

avutil/cpu: output cpu data to stdout

Errors go to stderr, but the cpu stats are non error output for cputest

This fixes echoing the cpu test results

Reviewed-by: James Almer <jamrial at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9101ef6757e964c64dd1b3c50baccbe6f5e52550
---

 libavutil/cpu.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libavutil/cpu.c b/libavutil/cpu.c
index 03f89cb..47d6fcc 100644
--- a/libavutil/cpu.c
+++ b/libavutil/cpu.c
@@ -331,12 +331,12 @@ static void print_cpu_flags(int cpu_flags, const char *type)
 {
     int i;
 
-    fprintf(stderr, "cpu_flags(%s) = 0x%08X\n", type, cpu_flags);
-    fprintf(stderr, "cpu_flags_str(%s) =", type);
+    printf("cpu_flags(%s) = 0x%08X\n", type, cpu_flags);
+    printf("cpu_flags_str(%s) =", type);
     for (i = 0; cpu_flag_tab[i].flag; i++)
         if (cpu_flags & cpu_flag_tab[i].flag)
-            fprintf(stderr, " %s", cpu_flag_tab[i].name);
-    fprintf(stderr, "\n");
+            printf(" %s", cpu_flag_tab[i].name);
+    printf("\n");
 }
 
 
@@ -382,7 +382,7 @@ int main(int argc, char **argv)
 
     print_cpu_flags(cpu_flags_raw, "raw");
     print_cpu_flags(cpu_flags_eff, "effective");
-    fprintf(stderr, "threads = %s (cpu_count = %d)\n", threads, cpu_count);
+    printf("threads = %s (cpu_count = %d)\n", threads, cpu_count);
 
     return 0;
 }



More information about the ffmpeg-cvslog mailing list