Merge commit 'e240a28b20680b326a39b0860fda37d7e459bfc0'

* commit 'e240a28b20680b326a39b0860fda37d7e459bfc0':
  cmdutils: Add auto to threading capabilities report

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

diff --cc cmdutils.c
index 1435317,065ba49..49da632
--- 1/cmdutils.c
--- 2/cmdutils.c
+++ b/cmdutils.c
@@@ -1322,11 -977,11 +1322,12 @@@ static void print_codec(const AVCodec *
      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 & (AV_CODEC_CAP_FRAME_THREADS |
-                                    AV_CODEC_CAP_SLICE_THREADS)) {
+                                    AV_CODEC_CAP_SLICE_THREADS |
+                                    AV_CODEC_CAP_AUTO_THREADS)) {
          case AV_CODEC_CAP_FRAME_THREADS |
               AV_CODEC_CAP_SLICE_THREADS: printf("frame and slice"); break;
          case AV_CODEC_CAP_FRAME_THREADS: printf("frame");           break;