cosmetics: reindent after last commit

[ffmpeg] / libavcodec / opt.c

diff --git a/libavcodec/opt.c b/libavcodec/opt.c
index 1c0bb6c7a8310c2371489667d7f8ec5c20b41dd3..04629b6a2f003a48cabf5af9ca02ded31d4527c8 100644 (file)
--- a/libavcodec/opt.c
+++ b/libavcodec/opt.c
@@ -20,7 +20,7 @@
  */
 
 /**
- * @file opt.c
+ * @file libavcodec/opt.c
  * AVOptions
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
@@ -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);
                 }
             }
@@ -199,6 +199,7 @@ int av_set_string3(void *obj, const char *name, const char *val, int alloc, cons
     return 0;
 }
 
+#if LIBAVCODEC_VERSION_MAJOR < 53
 const AVOption *av_set_string2(void *obj, const char *name, const char *val, int alloc){
     const AVOption *o;
     if (av_set_string3(obj, name, val, alloc, &o) < 0)
@@ -212,6 +213,7 @@ const AVOption *av_set_string(void *obj, const char *name, const char *val){
         return NULL;
     return o;
 }
+#endif
 
 const AVOption *av_set_double(void *obj, const char *name, double n){
     return av_set_number(obj, name, n, 1, 1);
@@ -422,7 +424,7 @@ void av_opt_set_defaults2(void *s, int mask, int flags)
             break;
             case FF_OPT_TYPE_INT64:
                 if((double)(opt->default_val+0.6) == opt->default_val)
-                    av_log(s, AV_LOG_DEBUG, "loss of precission in default of %s\n", opt->name);
+                    av_log(s, AV_LOG_DEBUG, "loss of precision in default of %s\n", opt->name);
                 av_set_int(s, opt->name, opt->default_val);
             break;
             case FF_OPT_TYPE_FLOAT: {