[FFmpeg-cvslog] ffprobe: simplify default printer

Stefano Sabatini git at videolan.org
Mon Sep 10 10:29:12 CEST 2012


ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Sun Sep  9 13:59:02 2012 +0200| [e4fe4d01fc31bfdabf6f9b106c633139287a400d] | committer: Stefano Sabatini

ffprobe: simplify default printer

Remove pointless default_print_footer() and
default_print_chapter_header() callbacks, also avoid to print an
empty line when noprint_wrappers is selected.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e4fe4d01fc31bfdabf6f9b106c633139287a400d
---

 ffprobe.c |   22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/ffprobe.c b/ffprobe.c
index 6649b86..d49245a 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -463,22 +463,6 @@ static av_cold int default_init(WriterContext *wctx, const char *args, void *opa
     return 0;
 }
 
-static void default_print_footer(WriterContext *wctx)
-{
-    DefaultContext *def = wctx->priv;
-
-    if (!def->noprint_wrappers)
-        printf("\n");
-}
-
-static void default_print_chapter_header(WriterContext *wctx, const char *chapter)
-{
-    DefaultContext *def = wctx->priv;
-
-    if (!def->noprint_wrappers && wctx->nb_chapter)
-        printf("\n");
-}
-
 /* lame uppercasing routine, assumes the string is lower case ASCII */
 static inline char *upcase_string(char *dst, size_t dst_size, const char *src)
 {
@@ -494,8 +478,6 @@ static void default_print_section_header(WriterContext *wctx, const char *sectio
     DefaultContext *def = wctx->priv;
     char buf[32];
 
-    if (wctx->nb_section)
-        printf("\n");
     if (!def->noprint_wrappers)
         printf("[%s]\n", upcase_string(buf, sizeof(buf), section));
 }
@@ -506,7 +488,7 @@ static void default_print_section_footer(WriterContext *wctx, const char *sectio
     char buf[32];
 
     if (!def->noprint_wrappers)
-        printf("[/%s]", upcase_string(buf, sizeof(buf), section));
+        printf("[/%s]\n", upcase_string(buf, sizeof(buf), section));
 }
 
 static void default_print_str(WriterContext *wctx, const char *key, const char *value)
@@ -540,8 +522,6 @@ static const Writer default_writer = {
     .name                  = "default",
     .priv_size             = sizeof(DefaultContext),
     .init                  = default_init,
-    .print_footer          = default_print_footer,
-    .print_chapter_header  = default_print_chapter_header,
     .print_section_header  = default_print_section_header,
     .print_section_footer  = default_print_section_footer,
     .print_integer         = default_print_int,



More information about the ffmpeg-cvslog mailing list