[SCM] libav/experimental: Make ffplay use parse_number_or_die instead of atoi. Stefano Sabatini, stefano.sabatini-lala poste it

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:16:34 UTC 2013


The following commit has been merged in the experimental branch:
commit c7193373fbf3a0374c1d4236eb677d727fc4ad88
Author: Diego Biurrun <diego at biurrun.de>
Date:   Sat Mar 8 15:06:43 2008 +0000

    Make ffplay use parse_number_or_die instead of atoi.
    Stefano Sabatini, stefano.sabatini-lala poste it
    
    Originally committed as revision 12366 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffplay.c b/ffplay.c
index 915c257..acb729a 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -2366,20 +2366,12 @@ static void opt_frame_size(const char *arg)
 
 static void opt_width(const char *arg)
 {
-    screen_width = atoi(arg);
-    if(screen_width<=0){
-        fprintf(stderr, "invalid width\n");
-        exit(1);
-    }
+    screen_width = parse_number_or_die("x", arg, OPT_INT64, 1, INT_MAX);
 }
 
 static void opt_height(const char *arg)
 {
-    screen_height = atoi(arg);
-    if(screen_height<=0){
-        fprintf(stderr, "invalid height\n");
-        exit(1);
-    }
+    screen_height = parse_number_or_die("y", arg, OPT_INT64, 1, INT_MAX);
 }
 
 static void opt_format(const char *arg)
@@ -2422,17 +2414,17 @@ static void opt_seek(const char *arg)
 static void opt_debug(const char *arg)
 {
     av_log_set_level(99);
-    debug = atoi(arg);
+    debug = parse_number_or_die("debug", arg, OPT_INT64, 0, INT_MAX);
 }
 
 static void opt_vismv(const char *arg)
 {
-    debug_mv = atoi(arg);
+    debug_mv = parse_number_or_die("vismv", arg, OPT_INT64, INT_MIN, INT_MAX);
 }
 
 static void opt_thread_count(const char *arg)
 {
-    thread_count= atoi(arg);
+    thread_count= parse_number_or_die("threads", arg, OPT_INT64, 0, INT_MAX);
 #if !defined(HAVE_THREADS)
     fprintf(stderr, "Warning: not compiled with thread support, using thread emulation\n");
 #endif

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list