Merge commit '70a7b24d56a823894440a372c46e89e212b89c35'

* commit '70a7b24d56a823894440a372c46e89e212b89c35':
  avutil: Add deprecation ifdefs around obsolete intfloat code

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavutil/intfloat_readwrite.c
index 142331d,71daa38..af5da62
--- 1/libavutil/intfloat_readwrite.c
--- 2/libavutil/intfloat_readwrite.c
+++ b/libavutil/intfloat_readwrite.c
@@@ -26,10 -26,11 +26,12 @@@
   */
  
  #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;

diff --cc libavutil/intfloat_readwrite.h
Simple merge

diff --cc libavutil/version.h
Simple merge