summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorSlavik Gnatenko <miracle9@newmail.ru>2003-03-11 12:09:13 +0000
committerMichael Niedermayer <michaelni@gmx.at>2003-03-11 12:09:13 +0000
commit69db4e10f27abe4d3a7036d5cdb29e1f9745c7a4 (patch)
treecc6816441950e87fe37d22dc37ea1dd25e0995d6 /libavcodec
parentdf99755bda623b8619476697d12eaab3f5af61c3 (diff)
restoring OS/2 compatibility patch by ("Slavik Gnatenko" <miracle9 at newmail dot ru>)
Originally committed as revision 1663 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/Makefile2
-rw-r--r--libavcodec/opts.c4
-rw-r--r--libavcodec/resample.c4
3 files changed, 8 insertions, 2 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index dd03125976..6fc214b848 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -125,9 +125,7 @@ tests: apiexample cpuid_test $(TESTS)
$(LIB): $(OBJS)
rm -f $@
$(AR) rc $@ $(OBJS)
-ifneq ($(CONFIG_OS2),yes)
$(RANLIB) $@
-endif
$(SLIB): $(OBJS)
$(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS)
diff --git a/libavcodec/opts.c b/libavcodec/opts.c
index 40a058de1a..5b643db287 100644
--- a/libavcodec/opts.c
+++ b/libavcodec/opts.c
@@ -12,6 +12,10 @@
#include "avcodec.h"
+#ifdef CONFIG_OS2
+#define strcasecmp(s1,s2) stricmp(s1,s2)
+#endif
+
const AVOption avoptions_common[] = {
AVOPTION_CODEC_FLAG("bit_exact", "use only bit-exact stuff", flags, CODEC_FLAG_BITEXACT, 0),
AVOPTION_CODEC_FLAG("mm_force", "force mm flags", dsp_mask, FF_MM_FORCE, 0),
diff --git a/libavcodec/resample.c b/libavcodec/resample.c
index 209a00808d..ba2bb81da2 100644
--- a/libavcodec/resample.c
+++ b/libavcodec/resample.c
@@ -24,6 +24,10 @@
#include "avcodec.h"
+#if defined (CONFIG_OS2)
+#define floorf(n) floor(n)
+#endif
+
typedef struct {
/* fractional resampling */
uint32_t incr; /* fractional increment */