Skip to content

F
ffmpeg.wasm-core
Commit f821b2ea authored by Vittorio Giovara's avatar Vittorio Giovara
Browse files
Options

avprobe: Support printing strings with empty keys

parent cc06f7bd
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 12 deletions
avtools/avprobe.c
View file @ f821b2ea
...@@ -235,10 +235,14 @@ static void ini_print_integer(const char *key, int64_t value) ...@@ -235,10 +235,14 @@ static void ini_print_integer(const char *key, int64_t value)
static void ini_print_string(const char *key, const char *value) static void ini_print_string(const char *key, const char *value)
{ {
ini_escape_print(key); if (key) {
avio_printf(probe_out, "="); ini_escape_print(key);
ini_escape_print(value); avio_printf(probe_out, "=%s\n", value);
avio_w8(probe_out, '\n'); } else {
if (octx.prefix[octx.level -1].nb_elems)
avio_printf(probe_out, ",");
avio_printf(probe_out, "%s", value);
}
} }
/* /*
...@@ -329,14 +333,24 @@ static void json_escape_print(const char *s) ...@@ -329,14 +333,24 @@ static void json_escape_print(const char *s)
static void json_print_string(const char *key, const char *value) static void json_print_string(const char *key, const char *value)
{ {
if (octx.prefix[octx.level -1].nb_elems) if (key) {
avio_printf(probe_out, ",\n"); if (octx.prefix[octx.level -1].nb_elems)
AVP_INDENT(); avio_printf(probe_out, ",\n");
avio_w8(probe_out, '\"'); AVP_INDENT();
json_escape_print(key); avio_w8(probe_out, '\"');
avio_printf(probe_out, "\" : \""); json_escape_print(key);
json_escape_print(value); avio_printf(probe_out, "\" : \"");
avio_w8(probe_out, '\"'); json_escape_print(value);
avio_w8(probe_out, '\"');
} else {
if (octx.prefix[octx.level -1].nb_elems)
avio_printf(probe_out, ", ");
else
AVP_INDENT();
avio_w8(probe_out, '\"');
json_escape_print(value);
avio_w8(probe_out, '\"');
}
} }
/* /*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment