Commit 70a7b24d authored by Diego Biurrun's avatar Diego Biurrun

avutil: Add deprecation ifdefs around obsolete intfloat code

This long-deprecated code should disappear at the next version bump.
parent 79d9884e
...@@ -28,7 +28,9 @@ ...@@ -28,7 +28,9 @@
#include <stdint.h> #include <stdint.h>
#include "mathematics.h" #include "mathematics.h"
#include "intfloat_readwrite.h" #include "intfloat_readwrite.h"
#include "version.h"
#if FF_API_INTFLOAT
double av_int2dbl(int64_t v){ double av_int2dbl(int64_t v){
if((uint64_t)v+v > 0xFFEULL<<52) if((uint64_t)v+v > 0xFFEULL<<52)
return NAN; return NAN;
...@@ -95,3 +97,4 @@ AVExtFloat av_dbl2ext(double d){ ...@@ -95,3 +97,4 @@ AVExtFloat av_dbl2ext(double d){
ext.exponent[0] |= 0x80; ext.exponent[0] |= 0x80;
return ext; return ext;
} }
#endif /* FF_API_INTFLOAT */
...@@ -22,8 +22,11 @@ ...@@ -22,8 +22,11 @@
#define AVUTIL_INTFLOAT_READWRITE_H #define AVUTIL_INTFLOAT_READWRITE_H
#include <stdint.h> #include <stdint.h>
#include "attributes.h" #include "attributes.h"
#include "version.h"
#if FF_API_INTFLOAT
/* IEEE 80 bits extended float */ /* IEEE 80 bits extended float */
typedef struct AVExtFloat { typedef struct AVExtFloat {
uint8_t exponent[2]; uint8_t exponent[2];
...@@ -36,5 +39,6 @@ attribute_deprecated double av_ext2dbl(const AVExtFloat ext) av_const; ...@@ -36,5 +39,6 @@ attribute_deprecated double av_ext2dbl(const AVExtFloat ext) av_const;
attribute_deprecated int64_t av_dbl2int(double d) av_const; attribute_deprecated int64_t av_dbl2int(double d) av_const;
attribute_deprecated int32_t av_flt2int(float d) av_const; attribute_deprecated int32_t av_flt2int(float d) av_const;
attribute_deprecated AVExtFloat av_dbl2ext(double d) av_const; attribute_deprecated AVExtFloat av_dbl2ext(double d) av_const;
#endif /* FF_API_INTFLOAT */
#endif /* AVUTIL_INTFLOAT_READWRITE_H */ #endif /* AVUTIL_INTFLOAT_READWRITE_H */
...@@ -91,6 +91,9 @@ ...@@ -91,6 +91,9 @@
#ifndef FF_API_XVMC #ifndef FF_API_XVMC
#define FF_API_XVMC (LIBAVUTIL_VERSION_MAJOR < 53) #define FF_API_XVMC (LIBAVUTIL_VERSION_MAJOR < 53)
#endif #endif
#ifndef FF_API_INTFLOAT
#define FF_API_INTFLOAT (LIBAVUTIL_VERSION_MAJOR < 53)
#endif
/** /**
* @} * @}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment