[SCM] libav/experimental: Log error message in case of invalid parsing.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:19:06 UTC 2013


The following commit has been merged in the experimental branch:
commit 9abf34411a37e6628b529da5686708b3f90a87db
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date:   Thu Nov 18 20:37:22 2010 +0000

    Log error message in case of invalid parsing.
    
    Originally committed as revision 25765 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavfilter/vf_aspect.c b/libavfilter/vf_aspect.c
index cdb5390..cccb117 100644
--- a/libavfilter/vf_aspect.c
+++ b/libavfilter/vf_aspect.c
@@ -37,8 +37,11 @@ static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
 
     if (args) {
         if (sscanf(args, "%d:%d", &aspect->aspect.num, &aspect->aspect.den) < 2) {
-            if (sscanf(args, "%lf", &ratio) < 1)
-                return -1;
+            if (sscanf(args, "%lf", &ratio) < 1) {
+                av_log(ctx, AV_LOG_ERROR,
+                       "Invalid string '%s' for aspect ratio.\n", args);
+                return AVERROR(EINVAL);
+            }
             aspect->aspect = av_d2q(ratio, 100);
         } else {
             gcd = av_gcd(FFABS(aspect->aspect.num), FFABS(aspect->aspect.den));

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list