[FFmpeg-cvslog] avprobe: correctly set the default formatter
Luca Barbato
git at videolan.org
Wed May 30 19:37:29 CEST 2012
ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Tue May 29 13:14:10 2012 -0700| [43b50e62c430adca04d26901b3c957fd9ea0e453] | committer: Luca Barbato
avprobe: correctly set the default formatter
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=43b50e62c430adca04d26901b3c957fd9ea0e453
---
avprobe.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/avprobe.c b/avprobe.c
index 3a0ee28..2464f86 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();
More information about the ffmpeg-cvslog
mailing list