RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '70a7b24d56a823894440a372c46e89e212b89c35' 

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-12-14 11:13:51 +01:00
parent 2cfccd8060 70a7b24d56
commit acda7c8e20
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavutil/intfloat_readwrite.c
View File

@ -29,7 +29,9 @@
#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;
@ -96,3 +98,4 @@ AVExtFloat av_dbl2ext(double d){
ext.exponent[0] |= 0x80;
return ext;
}
#endif /* FF_API_INTFLOAT */

6
libavutil/intfloat_readwrite.h
View File

@ -22,8 +22,11 @@
#define AVUTIL_INTFLOAT_READWRITE_H
#include <stdint.h>
#include "attributes.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 */

3
libavutil/version.h
View File

@ -150,6 +150,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
/**
* @}