diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2012-05-30 21:32:32 +0200 |
|---|---|---|
| committer | Nicolas George <nicolas.george@normalesup.org> | 2012-06-07 23:19:20 +0200 |
| commit | 6668ef756796cadaf6f378d4a43f7c2ad325bc8f (patch) | |
| tree | f6a6aba3fbfe0423c0c055faf132aef4f50d7741 /cmdutils.c | |
| parent | e0545262a2f91f034c575ca651c23a041f89da29 (diff) | |
| download | ffmpeg-6668ef756796cadaf6f378d4a43f7c2ad325bc8f.tar.gz | |
cmdutils: include threading caps in codecs listing.
Suggested by Roger Pack on ffmpeg-user.
Diffstat (limited to 'cmdutils.c')
| -rw-r--r-- | cmdutils.c | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/cmdutils.c b/cmdutils.c index 0ddd9b3cee..774c5fc05b 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -812,15 +812,18 @@ int opt_codecs(const char *opt, const char *arg) AVCodec *p = NULL, *p2; const char *last_name; printf("Codecs:\n" - " D..... = Decoding supported\n" - " .E.... = Encoding supported\n" - " ..V... = Video codec\n" - " ..A... = Audio codec\n" - " ..S... = Subtitle codec\n" - " ...S.. = Supports draw_horiz_band\n" - " ....D. = Supports direct rendering method 1\n" - " .....T = Supports weird frame truncation\n" - " ------\n"); + " D...... = Decoding supported\n" + " .E..... = Encoding supported\n" + " ..V.... = Video codec\n" + " ..A.... = Audio codec\n" + " ..S.... = Subtitle codec\n" + " ...S... = Supports draw_horiz_band\n" + " ....D.. = Supports direct rendering method 1\n" + " .....T. = Supports weird frame truncation\n" + " ......F = Supports frame-based multi-threading\n" + " ......S = Supports slice-based multi-threading\n" + " ......B = Supports both frame-based and slice-based multi-threading\n" + " --------\n"); last_name= "000"; for (;;) { int decode = 0; @@ -846,13 +849,15 @@ int opt_codecs(const char *opt, const char *arg) break; last_name = p2->name; - printf(" %s%s%c%s%s%s %-15s %s", + printf(" %s%s%c%s%s%s%s %-15s %s", decode ? "D" : (/* p2->decoder ? "d" : */ " "), encode ? "E" : " ", get_media_type_char(p2->type), cap & CODEC_CAP_DRAW_HORIZ_BAND ? "S" : " ", cap & CODEC_CAP_DR1 ? "D" : " ", cap & CODEC_CAP_TRUNCATED ? "T" : " ", + cap & CODEC_CAP_FRAME_THREADS ? cap & CODEC_CAP_SLICE_THREADS ? "B" : "F" : + cap & CODEC_CAP_SLICE_THREADS ? "S" : " ", p2->name, p2->long_name ? p2->long_name : ""); #if 0 |