[SCM] libav/experimental: Make opt_default() print an error message and exit if the option supplied is not recognized.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:00:59 UTC 2013


The following commit has been merged in the experimental branch:
commit 33bc794738224930f8ac07865861d07cbb959e3b
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date:   Mon Feb 22 12:28:51 2010 +0000

    Make opt_default() print an error message and exit if the option
    supplied is not recognized.
    
    Originally committed as revision 21960 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/cmdutils.c b/cmdutils.c
index b21380e..90c165e 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -214,8 +214,10 @@ int opt_default(const char *opt, const char *arg){
         fprintf(stderr, "Invalid value '%s' for option '%s'\n", arg, opt);
         exit(1);
     }
-    if(!o)
-        return -1;
+    if (!o) {
+        fprintf(stderr, "Unrecognized option '%s'\n", opt);
+        exit(1);
+    }
 
 //    av_log(NULL, AV_LOG_ERROR, "%s:%s: %f 0x%0X\n", opt, arg, av_get_double(avcodec_opts, opt, NULL), (int)av_get_int(avcodec_opts, opt, NULL));
 

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list