summaryrefslogtreecommitdiff
path: root/avprobe.c
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2012-05-29 13:14:10 -0700
committerLuca Barbato <lu_zero@gentoo.org>2012-05-29 14:09:43 -0700
commit43b50e62c430adca04d26901b3c957fd9ea0e453 (patch)
tree87d033cdf240757bb7347867557e2b79545024b3 /avprobe.c
parentb75726cb7903c30663faadf615d41486cbb5e828 (diff)
avprobe: correctly set the default formatter
Diffstat (limited to 'avprobe.c')
-rw-r--r--avprobe.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/avprobe.c b/avprobe.c
index 3a0ee28f8d..2464f8623a 100644
--- a/avprobe.c
+++ b/avprobe.c
@@ -933,6 +933,16 @@ int main(int argc, char **argv)
#endif
show_banner();
+
+ octx.print_header = ini_print_header;
+ octx.print_footer = ini_print_footer;
+
+ octx.print_array_header = ini_print_array_header;
+ octx.print_object_header = ini_print_object_header;
+
+ octx.print_integer = ini_print_integer;
+ octx.print_string = ini_print_string;
+
parse_options(NULL, argc, argv, options, opt_input_file);
if (!input_filename) {
@@ -949,15 +959,6 @@ int main(int argc, char **argv)
if (!probe_out)
exit(1);
- octx.print_header = ini_print_header;
- octx.print_footer = ini_print_footer;
-
- octx.print_array_header = ini_print_array_header;
- octx.print_object_header = ini_print_object_header;
-
- octx.print_integer = ini_print_integer;
- octx.print_string = ini_print_string;
-
probe_header();
ret = probe_file(input_filename);
probe_footer();