diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-16 22:46:23 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-16 22:46:23 +0200 |
| commit | 0ad43d0f15e3aea2d089af93cc2d993ec25fdda6 (patch) | |
| tree | 4ff21307eb0e34e9f6152cce7af4d55c9175d579 /cmdutils.c | |
| parent | 5063a18f5635008b2a45ada1f8c1e21e20450029 (diff) | |
| parent | e240a28b20680b326a39b0860fda37d7e459bfc0 (diff) | |
| download | ffmpeg-0ad43d0f15e3aea2d089af93cc2d993ec25fdda6.tar.gz | |
Merge commit 'e240a28b20680b326a39b0860fda37d7e459bfc0'
* commit 'e240a28b20680b326a39b0860fda37d7e459bfc0':
cmdutils: Add auto to threading capabilities report
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'cmdutils.c')
| -rw-r--r-- | cmdutils.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cmdutils.c b/cmdutils.c index 1435317c45..49da632574 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -1326,12 +1326,14 @@ static void print_codec(const AVCodec *c) 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; 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"); } |