History

Merge commit 'e240a28b20680b326a39b0860fda37d7e459bfc0'

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

Hendrik Leppkes committed 11 years ago

Commit 0ad43d02 parents 5063a18 e240a281 file · +4 −2Browse files

Unified · Split

cmdutils.c+4−2
@@ -1326,12 +1326,14 @@ static void print_codec(const AVCodec *c) · 1325 unmodified lines
13261326 c->type == AVMEDIA_TYPE_AUDIO) {
13271327 printf(" Threading capabilities: ");
13281328 switch (c->capabilities & (AV_CODEC_CAP_FRAME_THREADS |
1329− AV_CODEC_CAP_SLICE_THREADS)) {
1329+ AV_CODEC_CAP_SLICE_THREADS |
1330+ AV_CODEC_CAP_AUTO_THREADS)) {
13301331 case AV_CODEC_CAP_FRAME_THREADS |
13311332 AV_CODEC_CAP_SLICE_THREADS: printf("frame and slice"); break;
13321333 case AV_CODEC_CAP_FRAME_THREADS: printf("frame"); break;
13331334 case AV_CODEC_CAP_SLICE_THREADS: printf("slice"); break;
1334− default: printf("no"); break;
1335+ case AV_CODEC_CAP_AUTO_THREADS : printf("auto"); break;
1336+ default: printf("none"); break;
13351337 }
13361338 printf("\n");
13371339 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t