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)
commitaf7949fdea2f3115c82143178a22a39afe7bbde1
treea13279b4b881c3dbd172b21f9ea69321f3d9596b
parente28fabb4cbe5e7c6cde8a63733d7530f283a0acb
parent4a2ef39442bf7f0150db07a1fbfcf8286e4d44a3
Merge commit '4a2ef39442bf7f0150db07a1fbfcf8286e4d44a3'

* commit '4a2ef39442bf7f0150db07a1fbfcf8286e4d44a3':
  cosmetics: Add '0' to float constants ending in '.'.

Conflicts:
libavcodec/ra288.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
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