Commit 742d87d6 authored by Fabrice Bellard's avatar Fabrice Bellard

removed os_support.h

Originally committed as revision 2227 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent ca4a77c5
...@@ -492,4 +492,10 @@ static inline long int lrintf(float x) ...@@ -492,4 +492,10 @@ static inline long int lrintf(float x)
} }
#endif #endif
#if defined(CONFIG_OS2) || defined(CONFIG_SUNOS)
static inline float floorf(float f) {
return floor(f);
}
#endif
#endif #endif
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
*/ */
#include "avcodec.h" #include "avcodec.h"
#include "os_support.h"
const AVOption avoptions_common[] = { const AVOption avoptions_common[] = {
AVOPTION_CODEC_FLAG("bit_exact", "use only bit-exact stuff", flags, CODEC_FLAG_BITEXACT, 0), AVOPTION_CODEC_FLAG("bit_exact", "use only bit-exact stuff", flags, CODEC_FLAG_BITEXACT, 0),
...@@ -40,15 +39,32 @@ const AVOption avoptions_workaround_bug[] = { ...@@ -40,15 +39,32 @@ const AVOption avoptions_workaround_bug[] = {
AVOPTION_END() AVOPTION_END()
}; };
/* avoid compatibility problems by redefining it */
static int av_strcasecmp(const char *s1, const char *s2)
{
signed char val;
for(;;) {
val = toupper(*s1) - toupper(*s2);
if (val != 0)
break;
if (*s1 != '\0')
break;
s1++;
s2++;
}
return val;
}
static int parse_bool(const AVOption *c, char *s, int *var) static int parse_bool(const AVOption *c, char *s, int *var)
{ {
int b = 1; /* by default -on- when present */ int b = 1; /* by default -on- when present */
if (s) { if (s) {
if (!strcasecmp(s, "off") || !strcasecmp(s, "false") if (!av_strcasecmp(s, "off") || !av_strcasecmp(s, "false")
|| !strcmp(s, "0")) || !strcmp(s, "0"))
b = 0; b = 0;
else if (!strcasecmp(s, "on") || !strcasecmp(s, "true") else if (!av_strcasecmp(s, "on") || !av_strcasecmp(s, "true")
|| !strcmp(s, "1")) || !strcmp(s, "1"))
b = 1; b = 1;
else else
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
*/ */
#include "avcodec.h" #include "avcodec.h"
#include "os_support.h"
typedef struct { typedef struct {
/* fractional resampling */ /* fractional resampling */
......
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