Merge commit 'f776899a17dce32ad7fb9231d98f15558f37cc3f'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Jun 2013 21:18:57 +0000 (23:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Jun 2013 21:18:57 +0000 (23:18 +0200)
* commit 'f776899a17dce32ad7fb9231d98f15558f37cc3f':
  bitstream: K&R formatting cosmetics

Conflicts:
libavcodec/bitstream.c

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

@@@ -100,15 -102,14 +103,14 @@@ void avpriv_copy_bits(PutBitContext *pb
  
  static int alloc_table(VLC *vlc, int size, int use_static)
  {
-     int index;
-     index = vlc->table_size;
+     int index = vlc->table_size;
      vlc->table_size += size;
      if (vlc->table_size > vlc->table_allocated) {
-         if(use_static)
+         if (use_static)
              abort(); // cannot do anything, init_vlc() is used with too little memory
          vlc->table_allocated += (1 << vlc->bits);
-         vlc->table = av_realloc_f(vlc->table,
-                                   vlc->table_allocated, sizeof(VLC_TYPE) * 2);
 -        vlc->table = av_realloc(vlc->table, sizeof(VLC_TYPE) * 2 * vlc->table_allocated);
++        vlc->table = av_realloc_f(vlc->table, vlc->table_allocated, sizeof(VLC_TYPE) * 2);
          if (!vlc->table)
              return -1;
      }
@@@ -269,62 -268,39 +271,62 @@@ int ff_init_vlc_sparse(VLC *vlc, int nb
      int i, j, ret;
  
      vlc->bits = nb_bits;
-     if(flags & INIT_VLC_USE_NEW_STATIC){
+     if (flags & INIT_VLC_USE_NEW_STATIC) {
 -        if (vlc->table_size && vlc->table_size == vlc->table_allocated) {
 +        VLC dyn_vlc = *vlc;
 +
 +        if (vlc->table_size)
              return 0;
 -        } else if (vlc->table_size) {
 -            abort(); // fatal error, we are called on a partially initialized table
 -        }
 +
 +        ret = ff_init_vlc_sparse(&dyn_vlc, nb_bits, nb_codes,
 +                                 bits, bits_wrap, bits_size,
 +                                 codes, codes_wrap, codes_size,
 +                                 symbols, symbols_wrap, symbols_size,
 +                                 flags & ~INIT_VLC_USE_NEW_STATIC);
 +        av_assert0(ret >= 0);
 +        av_assert0(dyn_vlc.table_size <= vlc->table_allocated);
-         if(dyn_vlc.table_size < vlc->table_allocated)
++        if (dyn_vlc.table_size < vlc->table_allocated)
 +            av_log(NULL, AV_LOG_ERROR, "needed %d had %d\n", dyn_vlc.table_size, vlc->table_allocated);
 +        memcpy(vlc->table, dyn_vlc.table, dyn_vlc.table_size * sizeof(*vlc->table));
 +        vlc->table_size = dyn_vlc.table_size;
 +        ff_free_vlc(&dyn_vlc);
 +        return 0;
-     }else {
-         vlc->table = NULL;
+     } else {
+         vlc->table           = NULL;
          vlc->table_allocated = 0;
-         vlc->table_size = 0;
+         vlc->table_size      = 0;
      }
  
      av_dlog(NULL, "build table nb_codes=%d\n", nb_codes);
  
-     buf = av_malloc((nb_codes+1)*sizeof(VLCcode));
+     buf = av_malloc((nb_codes + 1) * sizeof(VLCcode));
  
 -    assert(symbols_size <= 2 || !symbols);
 +    av_assert0(symbols_size <= 2 || !symbols);
      j = 0;
 -#define COPY(condition)                                                     \
 +#define COPY(condition)\
-     for (i = 0; i < nb_codes; i++) {\
-         GET_DATA(buf[j].bits, bits, i, bits_wrap, bits_size);\
-         if (!(condition))\
-             continue;\
-         if (buf[j].bits > 3*nb_bits || buf[j].bits>32) {\
+     for (i = 0; i < nb_codes; i++) {                                        \
+         GET_DATA(buf[j].bits, bits, i, bits_wrap, bits_size);               \
+         if (!(condition))                                                   \
+             continue;                                                       \
++        if (buf[j].bits > 3*nb_bits || buf[j].bits>32) {                    \
 +            av_log(NULL, AV_LOG_ERROR, "Too long VLC (%d) in init_vlc\n", buf[j].bits);\
-             av_free(buf);\
-             return -1;\
-         }\
-         GET_DATA(buf[j].code, codes, i, codes_wrap, codes_size);\
-         if (buf[j].code >= (1LL<<buf[j].bits)) {\
-             av_log(NULL, AV_LOG_ERROR, "Invalid code in init_vlc\n");\
-             av_free(buf);\
-             return -1;\
-         }\
-         if (flags & INIT_VLC_LE)\
-             buf[j].code = bitswap_32(buf[j].code);\
-         else\
-             buf[j].code <<= 32 - buf[j].bits;\
-         if (symbols)\
-             GET_DATA(buf[j].symbol, symbols, i, symbols_wrap, symbols_size)\
-         else\
-             buf[j].symbol = i;\
-         j++;\
++            av_free(buf);                                                   \
++            return -1;                                                      \
++        }                                                                   \
+         GET_DATA(buf[j].code, codes, i, codes_wrap, codes_size);            \
++        if (buf[j].code >= (1LL<<buf[j].bits)) {                            \
++            av_log(NULL, AV_LOG_ERROR, "Invalid code in init_vlc\n");       \
++            av_free(buf);                                                   \
++            return -1;                                                      \
++        }                                                                   \
+         if (flags & INIT_VLC_LE)                                            \
+             buf[j].code = bitswap_32(buf[j].code);                          \
+         else                                                                \
+             buf[j].code <<= 32 - buf[j].bits;                               \
+         if (symbols)                                                        \
+             GET_DATA(buf[j].symbol, symbols, i, symbols_wrap, symbols_size) \
 -            else                                                            \
 -                buf[j].symbol = i;                                          \
++        else                                                                \
++            buf[j].symbol = i;                                              \
+         j++;                                                                \
      }
      COPY(buf[j].bits > nb_bits);
      // qsort is the slowest part of init_vlc, and could probably be improved or avoided