[FFmpeg-cvslog] avconv: remove bogus warning when using avconv -h without parameter

Janne Grunau git at videolan.org
Thu Oct 11 15:50:57 CEST 2012


ffmpeg | branch: master | Janne Grunau <janne-libav at jannau.net> | Wed Oct 10 20:35:26 2012 +0200| [8d09d39a4b87280ca728d65c4e1cd03d7360cc2b] | committer: Janne Grunau

avconv: remove bogus warning when using avconv -h without parameter

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

 avconv_opt.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/avconv_opt.c b/avconv_opt.c
index 9f30134..fd3d573 100644
--- a/avconv_opt.c
+++ b/avconv_opt.c
@@ -1792,7 +1792,7 @@ void show_help_default(const char *opt, const char *arg)
     const int per_file = OPT_SPEC | OPT_OFFSET | OPT_PERFILE;
     int show_advanced = 0, show_avoptions = 0;
 
-    if (opt) {
+    if (opt && *opt) {
         if (!strcmp(opt, "long"))
             show_advanced = 1;
         else if (!strcmp(opt, "full"))



More information about the ffmpeg-cvslog mailing list