Merge commit '9ef748173a4e0e58d40afaf38397783cd2537eaa'

* commit '9ef748173a4e0e58d40afaf38397783cd2537eaa':
  cmdutils: Print general codec capabilities

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

diff --cc cmdutils.c
index 49da632,5cb22f6..9cdc801
--- 1/cmdutils.c
--- 2/cmdutils.c
+++ b/cmdutils.c
@@@ -1322,8 -977,36 +1322,37 @@@ 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) {
+     printf("    General capabilities: ");
+     if (c->capabilities & AV_CODEC_CAP_DRAW_HORIZ_BAND)
+         printf("horizband ");
+     if (c->capabilities & AV_CODEC_CAP_DR1)
+         printf("dr1 ");
+     if (c->capabilities & AV_CODEC_CAP_TRUNCATED)
+         printf("trunc ");
+     if (c->capabilities & AV_CODEC_CAP_DELAY)
+         printf("delay ");
+     if (c->capabilities & AV_CODEC_CAP_SMALL_LAST_FRAME)
+         printf("small ");
+     if (c->capabilities & AV_CODEC_CAP_SUBFRAMES)
+         printf("subframes ");
+     if (c->capabilities & AV_CODEC_CAP_EXPERIMENTAL)
+         printf("exp ");
+     if (c->capabilities & AV_CODEC_CAP_CHANNEL_CONF)
+         printf("chconf ");
+     if (c->capabilities & AV_CODEC_CAP_PARAM_CHANGE)
+         printf("small ");
+     if (c->capabilities & AV_CODEC_CAP_PARAM_CHANGE)
+         printf("variable ");
+     if (c->capabilities & (AV_CODEC_CAP_FRAME_THREADS |
+                            AV_CODEC_CAP_SLICE_THREADS |
+                            AV_CODEC_CAP_AUTO_THREADS))
+         printf("threads ");
+     if (!c->capabilities)
+         printf("none");
+     printf("\n");
+ 
 +    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 |