diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2012-09-19 11:23:11 +0200 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2012-09-19 11:50:05 +0200 |
| commit | f398617b197d9a44b27d3313df8cd6c72b6a168a (patch) | |
| tree | 31a2ee72f68d2643d9fdd4fdedf8719bbe7b092a /ffprobe.c | |
| parent | d0c6ac0debaff1ca32be71cbbf958698106c3c4f (diff) | |
| download | ffmpeg-f398617b197d9a44b27d3313df8cd6c72b6a168a.tar.gz | |
ffprobe: fix CSV writer output
Fix regression introduced in 749ddc14fc9ebcef09965dfd98c8bf2505dc3b58.
Diffstat (limited to 'ffprobe.c')
| -rw-r--r-- | ffprobe.c | 24 |
1 files changed, 18 insertions, 6 deletions
@@ -709,22 +709,34 @@ static const Writer compact_writer = { /* CSV output */ -static av_cold int csv_init(WriterContext *wctx, const char *args, void *opaque) -{ - return compact_init(wctx, "item_sep=,:nokey=1:escape=csv", opaque); -} +#undef OFFSET +#define OFFSET(x) offsetof(CompactContext, x) + +static const AVOption csv_options[] = { + {"item_sep", "set item separator", OFFSET(item_sep_str), AV_OPT_TYPE_STRING, {.str=","}, CHAR_MIN, CHAR_MAX }, + {"s", "set item separator", OFFSET(item_sep_str), AV_OPT_TYPE_STRING, {.str=","}, CHAR_MIN, CHAR_MAX }, + {"nokey", "force no key printing", OFFSET(nokey), AV_OPT_TYPE_INT, {.i64=1}, 0, 1 }, + {"nk", "force no key printing", OFFSET(nokey), AV_OPT_TYPE_INT, {.i64=1}, 0, 1 }, + {"escape", "set escape mode", OFFSET(escape_mode_str), AV_OPT_TYPE_STRING, {.str="csv"}, CHAR_MIN, CHAR_MAX }, + {"e", "set escape mode", OFFSET(escape_mode_str), AV_OPT_TYPE_STRING, {.str="csv"}, CHAR_MIN, CHAR_MAX }, + {"print_section", "print section name", OFFSET(print_section), AV_OPT_TYPE_INT, {.i64=1}, 0, 1 }, + {"p", "print section name", OFFSET(print_section), AV_OPT_TYPE_INT, {.i64=1}, 0, 1 }, + {NULL}, +}; + +DEFINE_WRITER_CLASS(csv); static const Writer csv_writer = { .name = "csv", .priv_size = sizeof(CompactContext), - .init = csv_init, + .init = compact_init, .print_section_header = compact_print_section_header, .print_section_footer = compact_print_section_footer, .print_integer = compact_print_int, .print_string = compact_print_str, .show_tags = compact_show_tags, .flags = WRITER_FLAG_DISPLAY_OPTIONAL_FIELDS, - .priv_class = &compact_class, + .priv_class = &csv_class, }; /* Flat output */ |