diff options
author | Luca Barbato <lu_zero@gentoo.org> | 2013-06-21 14:47:01 +0200 |
---|---|---|
committer | Luca Barbato <lu_zero@gentoo.org> | 2013-07-07 04:28:51 +0200 |
commit | a4baf96abd64cda68e3e4692b182bdf60745a14d (patch) | |
tree | 7e50b3e2d3edfba41a0065484e23a19df6d1a6d3 | |
parent | cd7b6deeaaf1e9c771e998519554e75057c62580 (diff) | |
download | ffmpeg-a4baf96abd64cda68e3e4692b182bdf60745a14d.tar.gz |
avprobe: rename the prettyprint structures
-rw-r--r-- | avprobe.c | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -82,17 +82,17 @@ static void exit_program(void) typedef enum { ARRAY, OBJECT -} ProbeElementType; +} PrintElementType; typedef struct { const char *name; - ProbeElementType type; + PrintElementType type; int64_t index; int64_t nb_elems; -} ProbeElement; +} PrintElement; typedef struct { - ProbeElement *prefix; + PrintElement *prefix; int level; void (*print_header)(void); void (*print_footer)(void); @@ -104,10 +104,10 @@ typedef struct { void (*print_integer) (const char *key, int64_t value); void (*print_string) (const char *key, const char *value); -} OutputContext; +} PrintContext; static AVIOContext *probe_out = NULL; -static OutputContext octx; +static PrintContext octx; #define AVP_INDENT() avio_printf(probe_out, "%*c", octx.level * 2, ' ') /* @@ -166,7 +166,7 @@ static void ini_print_array_header(const char *name) static void ini_print_object_header(const char *name) { int i; - ProbeElement *el = octx.prefix + octx.level -1; + PrintElement *el = octx.prefix + octx.level -1; if (el->nb_elems) avio_printf(probe_out, "\n"); @@ -362,7 +362,7 @@ static void probe_group_enter(const char *name, int type) int64_t count = -1; octx.prefix = - av_realloc(octx.prefix, sizeof(ProbeElement) * (octx.level + 1)); + av_realloc(octx.prefix, sizeof(PrintElement) * (octx.level + 1)); if (!octx.prefix || !name) { fprintf(stderr, "Out of memory\n"); @@ -370,13 +370,13 @@ static void probe_group_enter(const char *name, int type) } if (octx.level) { - ProbeElement *parent = octx.prefix + octx.level -1; + PrintElement *parent = octx.prefix + octx.level -1; if (parent->type == ARRAY) count = parent->nb_elems; parent->nb_elems++; } - octx.prefix[octx.level++] = (ProbeElement){name, type, count, 0}; + octx.prefix[octx.level++] = (PrintElement){name, type, count, 0}; } static void probe_group_leave(void) |