generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'e240a28b20680b326a39b0860fda37d7e459bfc0'

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes
2015-10-16 22:46:23 +02:00
parent 5063a18f56 e240a28b20
commit 0ad43d0f15
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmdutils.c
View File

@@ -1326,12 +1326,14 @@ static void print_codec(const AVCodec *c)
c->type == AVMEDIA_TYPE_AUDIO) { c->type == AVMEDIA_TYPE_AUDIO) {
printf(" Threading capabilities: "); printf(" Threading capabilities: ");
switch (c->capabilities & (AV_CODEC_CAP_FRAME_THREADS | 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 | case AV_CODEC_CAP_FRAME_THREADS |
AV_CODEC_CAP_SLICE_THREADS: printf("frame and slice"); break; AV_CODEC_CAP_SLICE_THREADS: printf("frame and slice"); break;
case AV_CODEC_CAP_FRAME_THREADS: printf("frame"); break; case AV_CODEC_CAP_FRAME_THREADS: printf("frame"); break;
case AV_CODEC_CAP_SLICE_THREADS: printf("slice"); 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"); printf("\n");
} }