Merge commit '70a7b24d56a823894440a372c46e89e212b89c35'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 14 Dec 2013 10:13:51 +0000 (11:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 14 Dec 2013 10:13:55 +0000 (11:13 +0100)
* commit '70a7b24d56a823894440a372c46e89e212b89c35':
  avutil: Add deprecation ifdefs around obsolete intfloat code

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

   */
  
  #include <stdint.h>
 +#include "common.h"
  #include "mathematics.h"
  #include "intfloat_readwrite.h"
+ #include "version.h"
  
+ #if FF_API_INTFLOAT
  double av_int2dbl(int64_t v){
      if((uint64_t)v+v > 0xFFEULL<<52)
          return NAN;
Simple merge
Simple merge