[SCM] libav/experimental: Provide a context to av_log() calls in av_set_number2() and av_set_string3().

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


The following commit has been merged in the experimental branch:
commit 50f68bdebf79146df8f010bc6bad0b8145077944
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date:   Thu May 14 18:43:43 2009 +0000

    Provide a context to av_log() calls in av_set_number2() and
    av_set_string3().
    
    Originally committed as revision 18825 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/opt.c b/libavcodec/opt.c
index 76bf0b2..a6abcfc 100644
--- a/libavcodec/opt.c
+++ b/libavcodec/opt.c
@@ -56,7 +56,7 @@ static int av_set_number2(void *obj, const char *name, double num, int den, int6
         return AVERROR(ENOENT);
 
     if(o->max*den < num*intnum || o->min*den > num*intnum) {
-        av_log(NULL, AV_LOG_ERROR, "Value %lf for parameter '%s' out of range\n", num, name);
+        av_log(obj, AV_LOG_ERROR, "Value %lf for parameter '%s' out of range\n", num, name);
         return AVERROR(ERANGE);
     }
 
@@ -168,7 +168,7 @@ int av_set_string3(void *obj, const char *name, const char *val, int alloc, cons
                 else if(!strcmp(buf, "all"    )) d= ~0;
                 else {
                     if (error)
-                        av_log(NULL, AV_LOG_ERROR, "Unable to parse option value \"%s\": %s\n", val, error);
+                        av_log(obj, AV_LOG_ERROR, "Unable to parse option value \"%s\": %s\n", val, error);
                     return AVERROR(EINVAL);
                 }
             }

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list