Merge commit 'afe03092dd693d025d43e1620283d8d285c92772'

[ffmpeg] / cmdutils.c

diff --git a/cmdutils.c b/cmdutils.c
index ffe8d77e4b0667da0d47dd9c96a7f7dbcfd93137..1fe0e56d298100794c40db76b21111b6d2d3f96c 100644 (file)
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -910,7 +910,6 @@ static int init_report(const char *env)
            tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
            tm->tm_hour, tm->tm_min, tm->tm_sec,
            filename.str);
-    av_log_set_level(FFMAX(av_log_get_level(), AV_LOG_VERBOSE));
     av_bprint_finalize(&filename, NULL);
     return 0;
 }
@@ -1214,7 +1213,8 @@ static void print_codec(const AVCodec *c)
     printf("%s %s [%s]:\n", encoder ? "Encoder" : "Decoder", c->name,
            c->long_name ? c->long_name : "");
 
-    if (c->type == AVMEDIA_TYPE_VIDEO) {
+    if (c->type == AVMEDIA_TYPE_VIDEO ||
+        c->type == AVMEDIA_TYPE_AUDIO) {
         printf("    Threading capabilities: ");
         switch (c->capabilities & (CODEC_CAP_FRAME_THREADS |
                                    CODEC_CAP_SLICE_THREADS)) {