Merge commit '10db1a9bca46b0f760a1263d47142b2f57e195d7'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jul 2013 08:42:40 +0000 (10:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jul 2013 08:42:40 +0000 (10:42 +0200)
* commit '10db1a9bca46b0f760a1263d47142b2f57e195d7':
  avutil/tree: K&R formatting cosmetics

Conflicts:
libavutil/tree.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavutil/tree.c

@@@ -210,23 -218,23 +216,23 @@@ int main(void
      av_lfg_init(&prng, 1);
  
      for (i = 0; i < 10000; i++) {
 -        int j = av_lfg_get(&prng) % 86294;
 +        intptr_t j = av_lfg_get(&prng) % 86294;
          if (check(root) > 999) {
              av_log(NULL, AV_LOG_ERROR, "FATAL error %d\n", i);
-         print(root, 0);
+             print(root, 0);
              return -1;
          }
 -        av_log(NULL, AV_LOG_ERROR, "inserting %4d\n", j);
 +        av_log(NULL, AV_LOG_ERROR, "inserting %4d\n", (int)j);
          if (!node)
              node = av_tree_node_alloc();
-         av_tree_insert(&root, (void *) (j + 1), cmp, &node);
+         av_tree_insert(&root, (void *)(j + 1), cmp, &node);
  
          j = av_lfg_get(&prng) % 86294;
          {
              AVTreeNode *node2 = NULL;
 -            av_log(NULL, AV_LOG_ERROR, "removing %4d\n", j);
 +            av_log(NULL, AV_LOG_ERROR, "removing %4d\n", (int)j);
-             av_tree_insert(&root, (void *) (j + 1), cmp, &node2);
-             k = av_tree_find(root, (void *) (j + 1), cmp, NULL);
+             av_tree_insert(&root, (void *)(j + 1), cmp, &node2);
+             k = av_tree_find(root, (void *)(j + 1), cmp, NULL);
              if (k)
                  av_log(NULL, AV_LOG_ERROR, "removal failure %d\n", i);
          }