Merge commit '4a2ef39442bf7f0150db07a1fbfcf8286e4d44a3'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 26 Jul 2013 08:43:12 +0000 (10:43 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 26 Jul 2013 08:43:12 +0000 (10:43 +0200)
* commit '4a2ef39442bf7f0150db07a1fbfcf8286e4d44a3':
  cosmetics: Add '0' to float constants ending in '.'.

Conflicts:
libavcodec/ra288.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/aac_tablegen.h
libavcodec/aacdec.c
libavcodec/aacps_tablegen.h
libavcodec/acelp_vectors.c
libavcodec/qcelpdec.c
libavcodec/ra288.c
libavcodec/sipr.c
libavcodec/twinvq.c
libavcodec/vorbisenc.c
libavformat/swfenc.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -109,9 -104,9 +109,9 @@@ static void decode(RA288Context *ractx
      for (i=0; i < 5; i++)
          buffer[i] = codetable[cb_coef][i] * sumsum;
  
 -    sum = avpriv_scalarproduct_float_c(buffer, buffer, 5) * ((1 << 24) / 5.0);
 +    sum = avpriv_scalarproduct_float_c(buffer, buffer, 5);
  
-     sum = FFMAX(sum, 5. / (1<<24));
 -    sum = FFMAX(sum, 1);
++    sum = FFMAX(sum, 5.0 / (1<<24));
  
      /* shift and store */
      memmove(gain_block, gain_block + 1, 9 * sizeof(*gain_block));
Simple merge
Simple merge
Simple merge
Simple merge