diff options
| author | Diego Biurrun <diego@biurrun.de> | 2013-12-13 13:34:07 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2013-12-13 23:45:54 +0100 |
| commit | 70a7b24d56a823894440a372c46e89e212b89c35 (patch) | |
| tree | 3bc60dbc233c8c58fe1ecde3b2966ba338b77765 | |
| parent | 79d9884e9590c28a0a7ca802a3ba54f2ff4ee423 (diff) | |
| download | ffmpeg-70a7b24d56a823894440a372c46e89e212b89c35.tar.gz | |
avutil: Add deprecation ifdefs around obsolete intfloat code
This long-deprecated code should disappear at the next version bump.
| -rw-r--r-- | libavutil/intfloat_readwrite.c | 3 | ||||
| -rw-r--r-- | libavutil/intfloat_readwrite.h | 4 | ||||
| -rw-r--r-- | libavutil/version.h | 3 |
3 files changed, 10 insertions, 0 deletions
diff --git a/libavutil/intfloat_readwrite.c b/libavutil/intfloat_readwrite.c index 68385635ef..71daa381bd 100644 --- a/libavutil/intfloat_readwrite.c +++ b/libavutil/intfloat_readwrite.c @@ -28,7 +28,9 @@ #include <stdint.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; @@ -95,3 +97,4 @@ AVExtFloat av_dbl2ext(double d){ ext.exponent[0] |= 0x80; return ext; } +#endif /* FF_API_INTFLOAT */ diff --git a/libavutil/intfloat_readwrite.h b/libavutil/intfloat_readwrite.h index f093b92cd2..4759ab4916 100644 --- a/libavutil/intfloat_readwrite.h +++ b/libavutil/intfloat_readwrite.h @@ -22,8 +22,11 @@ #define AVUTIL_INTFLOAT_READWRITE_H #include <stdint.h> + #include "attributes.h" +#include "version.h" +#if FF_API_INTFLOAT /* IEEE 80 bits extended float */ typedef struct AVExtFloat { uint8_t exponent[2]; @@ -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 int32_t av_flt2int(float d) av_const; attribute_deprecated AVExtFloat av_dbl2ext(double d) av_const; +#endif /* FF_API_INTFLOAT */ #endif /* AVUTIL_INTFLOAT_READWRITE_H */ diff --git a/libavutil/version.h b/libavutil/version.h index dad8e2fd2a..eafc521949 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -91,6 +91,9 @@ #ifndef FF_API_XVMC #define FF_API_XVMC (LIBAVUTIL_VERSION_MAJOR < 53) #endif +#ifndef FF_API_INTFLOAT +#define FF_API_INTFLOAT (LIBAVUTIL_VERSION_MAJOR < 53) +#endif /** * @} |