aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2015-10-14 15:07:09 +0200
committerVittorio Giovara <vittorio.giovara@gmail.com>2015-10-15 15:43:21 +0200
commite240a28b20680b326a39b0860fda37d7e459bfc0 (patch)
tree50caebb8e42e57292d7a94e1d90bee50728893d7
parentd15368ee3926152a3a301c13cc638fbf7a062ddf (diff)
downloadffmpeg-e240a28b20680b326a39b0860fda37d7e459bfc0.tar.gz
cmdutils: Add auto to threading capabilities report
And use 'none' when such capabilities are not set. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
-rw-r--r--cmdutils.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/cmdutils.c b/cmdutils.c
index a4a4ae0e14..065ba497b0 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -980,12 +980,14 @@ static void print_codec(const AVCodec *c)
if (c->type == AVMEDIA_TYPE_VIDEO) {
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;
case AV_CODEC_CAP_SLICE_THREADS: printf("slice"); break;
- default: printf("no"); break;
+ case AV_CODEC_CAP_AUTO_THREADS : printf("auto"); break;
+ default: printf("none"); break;
}
printf("\n");
}