testprogs: K&R formatting cosmetics

1 files changed, 234 insertions, 172 deletions

diff --git a/libavutil/opt.c b/libavutil/opt.c
index 01502435b7..df3cc0884f 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -25,18 +25,18 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
-#include "avutil.h"
 #include "avstring.h"
+#include "avutil.h"
 #include "common.h"
-#include "opt.h"
-#include "eval.h"
 #include "dict.h"
+#include "eval.h"
 #include "log.h"
 #include "mathematics.h"
+#include "opt.h"
 
 const AVOption *av_opt_next(const void *obj, const AVOption *last)
 {
-    AVClass *class = *(AVClass**)obj;
+    AVClass *class = *(AVClass **)obj;
     if (!last && class->option && class->option[0].name)
         return class->option;
     if (last && last[1].name)
@@ -47,14 +47,25 @@ const AVOption *av_opt_next(const void *obj, const AVOption *last)
 static int read_number(const AVOption *o, const void *dst, double *num, int *den, int64_t *intnum)
 {
     switch (o->type) {
-    case AV_OPT_TYPE_FLAGS:     *intnum = *(unsigned int*)dst;return 0;
-    case AV_OPT_TYPE_INT:       *intnum = *(int         *)dst;return 0;
-    case AV_OPT_TYPE_INT64:     *intnum = *(int64_t     *)dst;return 0;
-    case AV_OPT_TYPE_FLOAT:     *num    = *(float       *)dst;return 0;
-    case AV_OPT_TYPE_DOUBLE:    *num    = *(double      *)dst;return 0;
-    case AV_OPT_TYPE_RATIONAL:  *intnum = ((AVRational*)dst)->num;
-                                *den    = ((AVRational*)dst)->den;
-                                                        return 0;
+    case AV_OPT_TYPE_FLAGS:
+        *intnum = *(unsigned int *)dst;
+        return 0;
+    case AV_OPT_TYPE_INT:
+        *intnum = *(int *)dst;
+        return 0;
+    case AV_OPT_TYPE_INT64:
+        *intnum = *(int64_t *)dst;
+        return 0;
+    case AV_OPT_TYPE_FLOAT:
+        *num = *(float *)dst;
+        return 0;
+    case AV_OPT_TYPE_DOUBLE:
+        *num = *(double *)dst;
+        return 0;
+    case AV_OPT_TYPE_RATIONAL:
+        *intnum = ((AVRational *)dst)->num;
+        *den    = ((AVRational *)dst)->den;
+        return 0;
     }
     return AVERROR(EINVAL);
 }
@@ -64,19 +75,29 @@ static int write_number(void *obj, const AVOption *o, void *dst, double num, int
     if (o->type != AV_OPT_TYPE_FLAGS &&
         (o->max * den < num * intnum || o->min * den > num * intnum)) {
         av_log(obj, AV_LOG_ERROR, "Value %f for parameter '%s' out of range\n",
-               num*intnum/den, o->name);
+               num * intnum / den, o->name);
         return AVERROR(ERANGE);
     }
 
     switch (o->type) {
     case AV_OPT_TYPE_FLAGS:
-    case AV_OPT_TYPE_INT:   *(int       *)dst= llrint(num/den)*intnum; break;
-    case AV_OPT_TYPE_INT64: *(int64_t   *)dst= llrint(num/den)*intnum; break;
-    case AV_OPT_TYPE_FLOAT: *(float     *)dst= num*intnum/den;         break;
-    case AV_OPT_TYPE_DOUBLE:*(double    *)dst= num*intnum/den;         break;
+    case AV_OPT_TYPE_INT:
+        *(int *)dst = llrint(num / den) * intnum;
+        break;
+    case AV_OPT_TYPE_INT64:
+        *(int64_t *)dst = llrint(num / den) * intnum;
+        break;
+    case AV_OPT_TYPE_FLOAT:
+        *(float *)dst = num * intnum / den;
+        break;
+    case AV_OPT_TYPE_DOUBLE:
+        *(double *)dst = num * intnum / den;
+        break;
     case AV_OPT_TYPE_RATIONAL:
-        if ((int)num == num) *(AVRational*)dst= (AVRational){num*intnum, den};
-        else                 *(AVRational*)dst= av_d2q(num*intnum/den, 1<<24);
+        if ((int) num == num)
+            *(AVRational *)dst = (AVRational) { num *intnum, den };
+        else
+            *(AVRational *)dst = av_d2q(num * intnum / den, 1 << 24);
         break;
     default:
         return AVERROR(EINVAL);
@@ -91,17 +112,21 @@ static const double const_values[] = {
     0
 };
 
-static const char * const const_names[] = {
+static const char *const const_names[] = {
     "PI",
     "E",
     "QP2LAMBDA",
     0
 };
 
-static int hexchar2int(char c) {
-    if (c >= '0' && c <= '9') return c - '0';
-    if (c >= 'a' && c <= 'f') return c - 'a' + 10;
-    if (c >= 'A' && c <= 'F') return c - 'A' + 10;
+static int hexchar2int(char c)
+{
+    if (c >= '0' && c <= '9')
+        return c - '0';
+    if (c >= 'a' && c <= 'f')
+        return c - 'a' + 10;
+    if (c >= 'A' && c <= 'F')
+        return c - 'A' + 10;
     return -1;
 }
 
@@ -130,7 +155,7 @@ static int set_string_binary(void *obj, const AVOption *o, const char *val, uint
         }
         *ptr++ = (a << 4) | b;
     }
-    *dst = bin;
+    *dst    = bin;
     *lendst = len;
 
     return 0;
@@ -146,8 +171,9 @@ static int set_string(void *obj, const AVOption *o, const char *val, uint8_t **d
 #define DEFAULT_NUMVAL(opt) ((opt->type == AV_OPT_TYPE_INT64 || \
                               opt->type == AV_OPT_TYPE_CONST || \
                               opt->type == AV_OPT_TYPE_FLAGS || \
-                              opt->type == AV_OPT_TYPE_INT) ? \
-                             opt->default_val.i64 : opt->default_val.dbl)
+                              opt->type == AV_OPT_TYPE_INT)     \
+                             ? opt->default_val.i64             \
+                             : opt->default_val.dbl)
 
 static int set_string_number(void *obj, void *target_obj, const AVOption *o, const char *val, void *dst)
 {
@@ -175,11 +201,16 @@ static int set_string_number(void *obj, void *target_obj, const AVOption *o, con
             const AVOption *o_named = av_opt_find(target_obj, buf, o->unit, 0, 0);
             if (o_named && o_named->type == AV_OPT_TYPE_CONST)
                 d = DEFAULT_NUMVAL(o_named);
-            else if (!strcmp(buf, "default")) d = DEFAULT_NUMVAL(o);
-            else if (!strcmp(buf, "max"    )) d = o->max;
-            else if (!strcmp(buf, "min"    )) d = o->min;
-            else if (!strcmp(buf, "none"   )) d = 0;
-            else if (!strcmp(buf, "all"    )) d = ~0;
+            else if (!strcmp(buf, "default"))
+                d = DEFAULT_NUMVAL(o);
+            else if (!strcmp(buf, "max"))
+                d = o->max;
+            else if (!strcmp(buf, "min"))
+                d = o->min;
+            else if (!strcmp(buf, "none"))
+                d = 0;
+            else if (!strcmp(buf, "all"))
+                d = ~0;
             else {
                 int res = av_expr_parse_and_eval(&d, buf, const_names, const_values, NULL, NULL, NULL, NULL, NULL, 0, obj);
                 if (res < 0) {
@@ -190,12 +221,16 @@ static int set_string_number(void *obj, void *target_obj, const AVOption *o, con
         }
         if (o->type == AV_OPT_TYPE_FLAGS) {
             read_number(o, dst, NULL, NULL, &intnum);
-            if      (cmd == '+') d = intnum | (int64_t)d;
-            else if (cmd == '-') d = intnum &~(int64_t)d;
+            if (cmd == '+')
+                d = intnum | (int64_t)d;
+            else if (cmd == '-')
+                d = intnum & ~(int64_t)d;
         } else {
             read_number(o, dst, &num, &den, &intnum);
-            if      (cmd == '+') d = notfirst*num*intnum/den + d;
-            else if (cmd == '-') d = notfirst*num*intnum/den - d;
+            if (cmd == '+')
+                d = notfirst * num * intnum / den + d;
+            else if (cmd == '-')
+                d = notfirst * num * intnum / den - d;
         }
 
         if ((ret = write_number(obj, o, dst, d, 1, 1)) < 0)
@@ -218,29 +253,33 @@ int av_opt_set(void *obj, const char *name, const char *val, int search_flags)
     if (!val || o->flags & AV_OPT_FLAG_READONLY)
         return AVERROR(EINVAL);
 
-    dst = ((uint8_t*)target_obj) + o->offset;
+    dst = ((uint8_t *)target_obj) + o->offset;
     switch (o->type) {
-    case AV_OPT_TYPE_STRING:   return set_string(obj, o, val, dst);
-    case AV_OPT_TYPE_BINARY:   return set_string_binary(obj, o, val, dst);
+    case AV_OPT_TYPE_STRING:
+        return set_string(obj, o, val, dst);
+    case AV_OPT_TYPE_BINARY:
+        return set_string_binary(obj, o, val, dst);
     case AV_OPT_TYPE_FLAGS:
     case AV_OPT_TYPE_INT:
     case AV_OPT_TYPE_INT64:
     case AV_OPT_TYPE_FLOAT:
     case AV_OPT_TYPE_DOUBLE:
-    case AV_OPT_TYPE_RATIONAL: return set_string_number(obj, target_obj, o, val, dst);
+    case AV_OPT_TYPE_RATIONAL:
+        return set_string_number(obj, target_obj, o, val, dst);
     }
 
     av_log(obj, AV_LOG_ERROR, "Invalid option type.\n");
     return AVERROR(EINVAL);
 }
 
-#define OPT_EVAL_NUMBER(name, opttype, vartype)\
-    int av_opt_eval_ ## name(void *obj, const AVOption *o, const char *val, vartype *name ## _out)\
-    {\
-        if (!o || o->type != opttype || o->flags & AV_OPT_FLAG_READONLY)\
-            return AVERROR(EINVAL);\
-        return set_string_number(obj, obj, o, val, name ## _out);\
-    }
+#define OPT_EVAL_NUMBER(name, opttype, vartype)                         \
+int av_opt_eval_ ## name(void *obj, const AVOption *o,                  \
+                         const char *val, vartype *name ## _out)        \
+{                                                                       \
+    if (!o || o->type != opttype || o->flags & AV_OPT_FLAG_READONLY)    \
+        return AVERROR(EINVAL);                                         \
+    return set_string_number(obj, obj, o, val, name ## _out);           \
+}
 
 OPT_EVAL_NUMBER(flags,  AV_OPT_TYPE_FLAGS,    int)
 OPT_EVAL_NUMBER(int,    AV_OPT_TYPE_INT,      int)
@@ -250,7 +289,7 @@ OPT_EVAL_NUMBER(double, AV_OPT_TYPE_DOUBLE,   double)
 OPT_EVAL_NUMBER(q,      AV_OPT_TYPE_RATIONAL, AVRational)
 
 static int set_number(void *obj, const char *name, double num, int den, int64_t intnum,
-                                  int search_flags)
+                      int search_flags)
 {
     void *dst, *target_obj;
     const AVOption *o = av_opt_find2(obj, name, NULL, 0, search_flags, &target_obj);
@@ -261,7 +300,7 @@ static int set_number(void *obj, const char *name, double num, int den, int64_t
     if (o->flags & AV_OPT_FLAG_READONLY)
         return AVERROR(EINVAL);
 
-    dst = ((uint8_t*)target_obj) + o->offset;
+    dst = ((uint8_t *)target_obj) + o->offset;
     return write_number(obj, o, dst, num, den, intnum);
 }
 
@@ -298,18 +337,19 @@ int av_opt_set_bin(void *obj, const char *name, const uint8_t *val, int len, int
     if (!ptr)
         return AVERROR(ENOMEM);
 
-    dst = (uint8_t **)(((uint8_t *)target_obj) + o->offset);
+    dst    = (uint8_t **)(((uint8_t *)target_obj) + o->offset);
     lendst = (int *)(dst + 1);
 
     av_free(*dst);
-    *dst = ptr;
+    *dst    = ptr;
     *lendst = len;
     memcpy(ptr, val, len);
 
     return 0;
 }
 
-int av_opt_set_dict_val(void *obj, const char *name, const AVDictionary *val, int search_flags)
+int av_opt_set_dict_val(void *obj, const char *name, const AVDictionary *val,
+                        int search_flags)
 {
     void *target_obj;
     AVDictionary **dst;
@@ -337,31 +377,44 @@ int av_opt_get(void *obj, const char *name, int search_flags, uint8_t **out_val)
     if (!o || !target_obj)
         return AVERROR_OPTION_NOT_FOUND;
 
-    dst = (uint8_t*)target_obj + o->offset;
+    dst = (uint8_t *)target_obj + o->offset;
 
     buf[0] = 0;
     switch (o->type) {
-    case AV_OPT_TYPE_FLAGS:     ret = snprintf(buf, sizeof(buf), "0x%08X",  *(int    *)dst);break;
-    case AV_OPT_TYPE_INT:       ret = snprintf(buf, sizeof(buf), "%d" ,     *(int    *)dst);break;
-    case AV_OPT_TYPE_INT64:     ret = snprintf(buf, sizeof(buf), "%"PRId64, *(int64_t*)dst);break;
-    case AV_OPT_TYPE_FLOAT:     ret = snprintf(buf, sizeof(buf), "%f" ,     *(float  *)dst);break;
-    case AV_OPT_TYPE_DOUBLE:    ret = snprintf(buf, sizeof(buf), "%f" ,     *(double *)dst);break;
-    case AV_OPT_TYPE_RATIONAL:  ret = snprintf(buf, sizeof(buf), "%d/%d",   ((AVRational*)dst)->num, ((AVRational*)dst)->den);break;
+    case AV_OPT_TYPE_FLAGS:
+        ret = snprintf(buf, sizeof(buf), "0x%08X", *(int *)dst);
+        break;
+    case AV_OPT_TYPE_INT:
+        ret = snprintf(buf, sizeof(buf), "%d", *(int *)dst);
+        break;
+    case AV_OPT_TYPE_INT64:
+        ret = snprintf(buf, sizeof(buf), "%" PRId64, *(int64_t *)dst);
+        break;
+    case AV_OPT_TYPE_FLOAT:
+        ret = snprintf(buf, sizeof(buf), "%f", *(float *)dst);
+        break;
+    case AV_OPT_TYPE_DOUBLE:
+        ret = snprintf(buf, sizeof(buf), "%f", *(double *)dst);
+        break;
+    case AV_OPT_TYPE_RATIONAL:
+        ret = snprintf(buf, sizeof(buf), "%d/%d", ((AVRational *)dst)->num,
+                       ((AVRational *)dst)->den);
+        break;
     case AV_OPT_TYPE_STRING:
-        if (*(uint8_t**)dst)
-            *out_val = av_strdup(*(uint8_t**)dst);
+        if (*(uint8_t **)dst)
+            *out_val = av_strdup(*(uint8_t **)dst);
         else
             *out_val = av_strdup("");
         return *out_val ? 0 : AVERROR(ENOMEM);
     case AV_OPT_TYPE_BINARY:
-        len = *(int*)(((uint8_t *)dst) + sizeof(uint8_t *));
-        if ((uint64_t)len*2 + 1 > INT_MAX)
+        len = *(int *)(((uint8_t *)dst) + sizeof(uint8_t *));
+        if ((uint64_t)len * 2 + 1 > INT_MAX)
             return AVERROR(EINVAL);
-        if (!(*out_val = av_malloc(len*2 + 1)))
+        if (!(*out_val = av_malloc(len * 2 + 1)))
             return AVERROR(ENOMEM);
-        bin = *(uint8_t**)dst;
+        bin = *(uint8_t **)dst;
         for (i = 0; i < len; i++)
-            snprintf(*out_val + i*2, 3, "%02X", bin[i]);
+            snprintf(*out_val + i * 2, 3, "%02X", bin[i]);
         return 0;
     default:
         return AVERROR(EINVAL);
@@ -381,52 +434,53 @@ static int get_number(void *obj, const char *name, double *num, int *den, int64_
     if (!o || !target_obj)
         goto error;
 
-    dst = ((uint8_t*)target_obj) + o->offset;
+    dst = ((uint8_t *)target_obj) + o->offset;
 
     return read_number(o, dst, num, den, intnum);
 
 error:
-    *den=*intnum=0;
+    *den    =
+    *intnum = 0;
     return -1;
 }
 
 int av_opt_get_int(void *obj, const char *name, int search_flags, int64_t *out_val)
 {
     int64_t intnum = 1;
-    double     num = 1;
-    int   ret, den = 1;
+    double num = 1;
+    int ret, den = 1;
 
     if ((ret = get_number(obj, name, &num, &den, &intnum, search_flags)) < 0)
         return ret;
-    *out_val = num*intnum/den;
+    *out_val = num * intnum / den;
     return 0;
 }
 
 int av_opt_get_double(void *obj, const char *name, int search_flags, double *out_val)
 {
     int64_t intnum = 1;
-    double     num = 1;
-    int   ret, den = 1;
+    double num = 1;
+    int ret, den = 1;
 
     if ((ret = get_number(obj, name, &num, &den, &intnum, search_flags)) < 0)
         return ret;
-    *out_val = num*intnum/den;
+    *out_val = num * intnum / den;
     return 0;
 }
 
 int av_opt_get_q(void *obj, const char *name, int search_flags, AVRational *out_val)
 {
     int64_t intnum = 1;
-    double     num = 1;
-    int   ret, den = 1;
+    double num = 1;
+    int ret, den = 1;
 
     if ((ret = get_number(obj, name, &num, &den, &intnum, search_flags)) < 0)
         return ret;
 
     if (num == 1.0 && (int)intnum == intnum)
-        *out_val = (AVRational){intnum, den};
+        *out_val = (AVRational) { intnum, den };
     else
-        *out_val = av_d2q(num*intnum/den, 1<<24);
+        *out_val = av_d2q(num * intnum / den, 1 << 24);
     return 0;
 }
 
@@ -463,7 +517,7 @@ int av_opt_flag_is_set(void *obj, const char *field_name, const char *flag_name)
 static void opt_list(void *obj, void *av_log_obj, const char *unit,
                      int req_flags, int rej_flags)
 {
-    const AVOption *opt=NULL;
+    const AVOption *opt = NULL;
 
     while ((opt = av_opt_next(obj, opt))) {
         if (!(opt->flags & req_flags) || (opt->flags & rej_flags))
@@ -473,11 +527,11 @@ static void opt_list(void *obj, void *av_log_obj, const char *unit,
          * Don't print anything but CONST's on level two.
          * Only print items from the requested unit.
          */
-        if (!unit && opt->type==AV_OPT_TYPE_CONST)
+        if (!unit && opt->type == AV_OPT_TYPE_CONST)
             continue;
-        else if (unit && opt->type!=AV_OPT_TYPE_CONST)
+        else if (unit && opt->type != AV_OPT_TYPE_CONST)
             continue;
-        else if (unit && opt->type==AV_OPT_TYPE_CONST && strcmp(unit, opt->unit))
+        else if (unit && opt->type == AV_OPT_TYPE_CONST && strcmp(unit, opt->unit))
             continue;
         else if (unit && opt->type == AV_OPT_TYPE_CONST)
             av_log(av_log_obj, AV_LOG_INFO, "   %-15s ", opt->name);
@@ -485,39 +539,39 @@ static void opt_list(void *obj, void *av_log_obj, const char *unit,
             av_log(av_log_obj, AV_LOG_INFO, "-%-17s ", opt->name);
 
         switch (opt->type) {
-            case AV_OPT_TYPE_FLAGS:
-                av_log(av_log_obj, AV_LOG_INFO, "%-7s ", "<flags>");
-                break;
-            case AV_OPT_TYPE_INT:
-                av_log(av_log_obj, AV_LOG_INFO, "%-7s ", "<int>");
-                break;
-            case AV_OPT_TYPE_INT64:
-                av_log(av_log_obj, AV_LOG_INFO, "%-7s ", "<int64>");
-                break;
-            case AV_OPT_TYPE_DOUBLE:
-                av_log(av_log_obj, AV_LOG_INFO, "%-7s ", "<double>");
-                break;
-            case AV_OPT_TYPE_FLOAT:
-                av_log(av_log_obj, AV_LOG_INFO, "%-7s ", "<float>");
-                break;
-            case AV_OPT_TYPE_STRING:
-                av_log(av_log_obj, AV_LOG_INFO, "%-7s ", "<string>");
-                break;
-            case AV_OPT_TYPE_RATIONAL:
-                av_log(av_log_obj, AV_LOG_INFO, "%-7s ", "<rational>");
-                break;
-            case AV_OPT_TYPE_BINARY:
-                av_log(av_log_obj, AV_LOG_INFO, "%-7s ", "<binary>");
-                break;
-            case AV_OPT_TYPE_CONST:
-            default:
-                av_log(av_log_obj, AV_LOG_INFO, "%-7s ", "");
-                break;
+        case AV_OPT_TYPE_FLAGS:
+            av_log(av_log_obj, AV_LOG_INFO, "%-7s ", "<flags>");
+            break;
+        case AV_OPT_TYPE_INT:
+            av_log(av_log_obj, AV_LOG_INFO, "%-7s ", "<int>");
+            break;
+        case AV_OPT_TYPE_INT64:
+            av_log(av_log_obj, AV_LOG_INFO, "%-7s ", "<int64>");
+            break;
+        case AV_OPT_TYPE_DOUBLE:
+            av_log(av_log_obj, AV_LOG_INFO, "%-7s ", "<double>");
+            break;
+        case AV_OPT_TYPE_FLOAT:
+            av_log(av_log_obj, AV_LOG_INFO, "%-7s ", "<float>");
+            break;
+        case AV_OPT_TYPE_STRING:
+            av_log(av_log_obj, AV_LOG_INFO, "%-7s ", "<string>");
+            break;
+        case AV_OPT_TYPE_RATIONAL:
+            av_log(av_log_obj, AV_LOG_INFO, "%-7s ", "<rational>");
+            break;
+        case AV_OPT_TYPE_BINARY:
+            av_log(av_log_obj, AV_LOG_INFO, "%-7s ", "<binary>");
+            break;
+        case AV_OPT_TYPE_CONST:
+        default:
+            av_log(av_log_obj, AV_LOG_INFO, "%-7s ", "");
+            break;
         }
         av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_ENCODING_PARAM) ? 'E' : '.');
         av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_DECODING_PARAM) ? 'D' : '.');
-        av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_VIDEO_PARAM   ) ? 'V' : '.');
-        av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_AUDIO_PARAM   ) ? 'A' : '.');
+        av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_VIDEO_PARAM)    ? 'V' : '.');
+        av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_AUDIO_PARAM)    ? 'A' : '.');
         av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_SUBTITLE_PARAM) ? 'S' : '.');
         av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_EXPORT)         ? 'X' : '.');
         av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_READONLY)       ? 'R' : '.');
@@ -525,9 +579,8 @@ static void opt_list(void *obj, void *av_log_obj, const char *unit,
         if (opt->help)
             av_log(av_log_obj, AV_LOG_INFO, " %s", opt->help);
         av_log(av_log_obj, AV_LOG_INFO, "\n");
-        if (opt->unit && opt->type != AV_OPT_TYPE_CONST) {
+        if (opt->unit && opt->type != AV_OPT_TYPE_CONST)
             opt_list(obj, av_log_obj, opt->unit, req_flags, rej_flags);
-        }
     }
 }
 
@@ -536,7 +589,7 @@ int av_opt_show2(void *obj, void *av_log_obj, int req_flags, int rej_flags)
     if (!obj)
         return -1;
 
-    av_log(av_log_obj, AV_LOG_INFO, "%s AVOptions:\n", (*(AVClass**)obj)->class_name);
+    av_log(av_log_obj, AV_LOG_INFO, "%s AVOptions:\n", (*(AVClass **)obj)->class_name);
 
     opt_list(obj, av_log_obj, NULL, req_flags, rej_flags);
 
@@ -551,36 +604,39 @@ void av_opt_set_defaults(void *s)
             continue;
 
         switch (opt->type) {
-            case AV_OPT_TYPE_CONST:
-                /* Nothing to be done here */
-            break;
-            case AV_OPT_TYPE_FLAGS:
-            case AV_OPT_TYPE_INT:
-            case AV_OPT_TYPE_INT64:
-                av_opt_set_int(s, opt->name, opt->default_val.i64, 0);
+        case AV_OPT_TYPE_CONST:
+            /* Nothing to be done here */
             break;
-            case AV_OPT_TYPE_DOUBLE:
-            case AV_OPT_TYPE_FLOAT: {
-                double val;
-                val = opt->default_val.dbl;
-                av_opt_set_double(s, opt->name, val, 0);
-            }
+        case AV_OPT_TYPE_FLAGS:
+        case AV_OPT_TYPE_INT:
+        case AV_OPT_TYPE_INT64:
+            av_opt_set_int(s, opt->name, opt->default_val.i64, 0);
             break;
-            case AV_OPT_TYPE_RATIONAL: {
-                AVRational val;
-                val = av_d2q(opt->default_val.dbl, INT_MAX);
-                av_opt_set_q(s, opt->name, val, 0);
-            }
+        case AV_OPT_TYPE_DOUBLE:
+        case AV_OPT_TYPE_FLOAT:
+        {
+            double val;
+            val = opt->default_val.dbl;
+            av_opt_set_double(s, opt->name, val, 0);
+        }
+        break;
+        case AV_OPT_TYPE_RATIONAL:
+        {
+            AVRational val;
+            val = av_d2q(opt->default_val.dbl, INT_MAX);
+            av_opt_set_q(s, opt->name, val, 0);
+        }
+        break;
+        case AV_OPT_TYPE_STRING:
+            av_opt_set(s, opt->name, opt->default_val.str, 0);
             break;
-            case AV_OPT_TYPE_STRING:
-                av_opt_set(s, opt->name, opt->default_val.str, 0);
-                break;
-            case AV_OPT_TYPE_BINARY:
-            case AV_OPT_TYPE_DICT:
-                /* Cannot set defaults for these types */
+        case AV_OPT_TYPE_BINARY:
+        case AV_OPT_TYPE_DICT:
+            /* Cannot set defaults for these types */
             break;
-            default:
-                av_log(s, AV_LOG_DEBUG, "AVOption type %d of option %s not implemented yet\n", opt->type, opt->name);
+        default:
+            av_log(s, AV_LOG_DEBUG, "AVOption type %d of option %s not implemented yet\n",
+                   opt->type, opt->name);
         }
     }
 }
@@ -706,7 +762,7 @@ const AVOption *av_opt_find(void *obj, const char *name, const char *unit,
 const AVOption *av_opt_find2(void *obj, const char *name, const char *unit,
                              int opt_flags, int search_flags, void **target_obj)
 {
-    const AVClass  *c = *(AVClass**)obj;
+    const AVClass  *c = *(AVClass **)obj;
     const AVOption *o = NULL;
 
     if (!c)
@@ -729,7 +785,7 @@ const AVOption *av_opt_find2(void *obj, const char *name, const char *unit,
     while (o = av_opt_next(obj, o)) {
         if (!strcmp(o->name, name) && (o->flags & opt_flags) == opt_flags &&
             ((!unit && o->type != AV_OPT_TYPE_CONST) ||
-             (unit  && o->unit && !strcmp(o->unit, unit)))) {
+              (unit && o->unit && !strcmp(o->unit, unit)))) {
             if (target_obj) {
                 if (!(search_flags & AV_OPT_SEARCH_FAKE_OBJ))
                     *target_obj = obj;
@@ -744,7 +800,7 @@ const AVOption *av_opt_find2(void *obj, const char *name, const char *unit,
 
 void *av_opt_child_next(void *obj, void *prev)
 {
-    const AVClass *c = *(AVClass**)obj;
+    const AVClass *c = *(AVClass **)obj;
     if (c->child_next)
         return c->child_next(obj, prev);
     return NULL;
@@ -759,15 +815,22 @@ const AVClass *av_opt_child_class_next(const AVClass *parent, const AVClass *pre
 
 static int opt_size(enum AVOptionType type)
 {
-    switch(type) {
+    switch (type) {
     case AV_OPT_TYPE_INT:
-    case AV_OPT_TYPE_FLAGS:     return sizeof(int);
-    case AV_OPT_TYPE_INT64:     return sizeof(int64_t);
-    case AV_OPT_TYPE_DOUBLE:    return sizeof(double);
-    case AV_OPT_TYPE_FLOAT:     return sizeof(float);
-    case AV_OPT_TYPE_STRING:    return sizeof(uint8_t*);
-    case AV_OPT_TYPE_RATIONAL:  return sizeof(AVRational);
-    case AV_OPT_TYPE_BINARY:    return sizeof(uint8_t*) + sizeof(int);
+    case AV_OPT_TYPE_FLAGS:
+        return sizeof(int);
+    case AV_OPT_TYPE_INT64:
+        return sizeof(int64_t);
+    case AV_OPT_TYPE_DOUBLE:
+        return sizeof(double);
+    case AV_OPT_TYPE_FLOAT:
+        return sizeof(float);
+    case AV_OPT_TYPE_STRING:
+        return sizeof(uint8_t *);
+    case AV_OPT_TYPE_RATIONAL:
+        return sizeof(AVRational);
+    case AV_OPT_TYPE_BINARY:
+        return sizeof(uint8_t *) + sizeof(int);
     }
     return AVERROR(EINVAL);
 }
@@ -781,22 +844,22 @@ int av_opt_copy(void *dst, const void *src)
     if (!src)
         return AVERROR(EINVAL);
 
-    c = *(AVClass**)src;
-    if (!c || c != *(AVClass**)dst)
+    c = *(AVClass **)src;
+    if (!c || c != *(AVClass **)dst)
         return AVERROR(EINVAL);
 
     while ((o = av_opt_next(src, o))) {
-        void *field_dst = ((uint8_t*)dst) + o->offset;
-        void *field_src = ((uint8_t*)src) + o->offset;
-        uint8_t **field_dst8 = (uint8_t**)field_dst;
-        uint8_t **field_src8 = (uint8_t**)field_src;
+        void *field_dst = (uint8_t *)dst + o->offset;
+        void *field_src = (uint8_t *)src + o->offset;
+        uint8_t **field_dst8 = (uint8_t **)field_dst;
+        uint8_t **field_src8 = (uint8_t **)field_src;
 
         if (o->type == AV_OPT_TYPE_STRING) {
             set_string(dst, o, *field_src8, field_dst8);
             if (*field_src8 && !*field_dst8)
                 ret = AVERROR(ENOMEM);
         } else if (o->type == AV_OPT_TYPE_BINARY) {
-            int len = *(int*)(field_src8 + 1);
+            int len = *(int *)(field_src8 + 1);
             if (*field_dst8 != *field_src8)
                 av_freep(field_dst8);
             if (len) {
@@ -809,7 +872,7 @@ int av_opt_copy(void *dst, const void *src)
             } else {
                 *field_dst8 = NULL;
             }
-            *(int*)(field_dst8 + 1) = len;
+            *(int *)(field_dst8 + 1) = len;
         } else if (o->type == AV_OPT_TYPE_CONST) {
             // do nothing
         } else {
@@ -825,8 +888,7 @@ int av_opt_copy(void *dst, const void *src)
 
 #ifdef TEST
 
-typedef struct TestContext
-{
+typedef struct TestContext {
     const AVClass *class;
     int num;
     int toggle;
@@ -841,16 +903,16 @@ typedef struct TestContext
 #define TEST_FLAG_LAME 02
 #define TEST_FLAG_MU   04
 
-static const AVOption test_options[]= {
-{"num",      "set num",        OFFSET(num),      AV_OPT_TYPE_INT,      {.i64 = 0},       0,        100                 },
-{"toggle",   "set toggle",     OFFSET(toggle),   AV_OPT_TYPE_INT,      {.i64 = 0},       0,        1                   },
-{"rational", "set rational",   OFFSET(rational), AV_OPT_TYPE_RATIONAL, {.dbl = 0},  0,        10                  },
-{"string",   "set string",     OFFSET(string),   AV_OPT_TYPE_STRING,   {0},              CHAR_MIN, CHAR_MAX            },
-{"flags",    "set flags",      OFFSET(flags),    AV_OPT_TYPE_FLAGS,    {.i64 = 0},       0,        INT_MAX, 0, "flags" },
-{"cool",     "set cool flag ", 0,                AV_OPT_TYPE_CONST,    {.i64 = TEST_FLAG_COOL}, INT_MIN,  INT_MAX, 0, "flags" },
-{"lame",     "set lame flag ", 0,                AV_OPT_TYPE_CONST,    {.i64 = TEST_FLAG_LAME}, INT_MIN,  INT_MAX, 0, "flags" },
-{"mu",       "set mu flag ",   0,                AV_OPT_TYPE_CONST,    {.i64 = TEST_FLAG_MU},   INT_MIN,  INT_MAX, 0, "flags" },
-{NULL},
+static const AVOption test_options[] = {
+    { "num",      "set num",        OFFSET(num),      AV_OPT_TYPE_INT,      { .i64 = 0 },                    0,      100 },
+    { "toggle",   "set toggle",     OFFSET(toggle),   AV_OPT_TYPE_INT,      { .i64 = 0 },                    0,        1 },
+    { "rational", "set rational",   OFFSET(rational), AV_OPT_TYPE_RATIONAL, { .dbl = 0 },                    0,       10 },
+    { "string",   "set string",     OFFSET(string),   AV_OPT_TYPE_STRING,   { 0 },                    CHAR_MIN, CHAR_MAX },
+    { "flags",    "set flags",      OFFSET(flags),    AV_OPT_TYPE_FLAGS,    { .i64 = 0 },                    0,  INT_MAX, 0, "flags"},
+    { "cool",     "set cool flag ", 0,                AV_OPT_TYPE_CONST,    { .i64 = TEST_FLAG_COOL }, INT_MIN,  INT_MAX, 0, "flags"},
+    { "lame",     "set lame flag ", 0,                AV_OPT_TYPE_CONST,    { .i64 = TEST_FLAG_LAME }, INT_MIN,  INT_MAX, 0, "flags"},
+    { "mu",       "set mu flag ",   0,                AV_OPT_TYPE_CONST,    { .i64 = TEST_FLAG_MU },   INT_MIN,  INT_MAX, 0, "flags"},
+    { NULL },
 };
 
 static const char *test_get_name(void *ctx)