From f9fada2704df7994e8e4451ac78d8d5569faa8a2 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Wed, 15 Aug 2012 10:31:46 +0200
Subject: avconv: split printing "main options" into global and per-file.

---
 cmdutils.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'cmdutils.c')

diff --git a/cmdutils.c b/cmdutils.c
index 50076c231d..6576eba95c 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -114,7 +114,7 @@ int64_t parse_time_or_die(const char *context, const char *timestr,
 }
 
 void show_help_options(const OptionDef *options, const char *msg, int req_flags,
-                       int rej_flags)
+                       int rej_flags, int alt_flags)
 {
     const OptionDef *po;
     int first;
@@ -124,6 +124,7 @@ void show_help_options(const OptionDef *options, const char *msg, int req_flags,
         char buf[64];
 
         if (((po->flags & req_flags) != req_flags) ||
+            (alt_flags && !(po->flags & alt_flags)) ||
             (po->flags & rej_flags))
             continue;
 
-- 
cgit v1.2.3